CI: add aarch64-linux-debug job and flatten dirs

This commit is contained in:
Andrew Kelley 2022-11-30 15:56:50 -07:00
parent c37afa2811
commit 9f9f1aadc7
8 changed files with 94 additions and 24 deletions

View File

@ -15,16 +15,28 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Build and Test - name: Build and Test
run: sh ./ci/linux/build-x86_64-debug.sh run: sh ci/x86_64-linux-debug.sh
- name: Print Version
run: echo "$(build-debug/stage3-debug/bin/zig version)"
x86_64-linux-release: x86_64-linux-release:
runs-on: [self-hosted, Linux, x86_64] runs-on: [self-hosted, Linux, x86_64]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Build and Test - name: Build and Test
run: sh ./ci/linux/build-x86_64-release.sh run: sh ci/x86_64-linux-release.sh
aarch64-linux-debug:
runs-on: [self-hosted, Linux, aarch64]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build and Test
run: sh ci/aarch64-linux-debug.sh
aarch64-linux-release:
runs-on: [self-hosted, Linux, aarch64]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build and Test
run: sh ci/aarch64-linux-release.sh
x86_64-macos: x86_64-macos:
runs-on: "macos-11" runs-on: "macos-11"
env: env:
@ -33,23 +45,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Build and Test - name: Build and Test
run: ./ci/macos/build-x86_64.sh run: ci/x86_64-macos.sh
x86_64-windows:
runs-on: windows-latest
env:
ARCH: "x86_64"
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build and Test
run: ./ci/windows/build.ps1
aarch64-linux:
runs-on: [self-hosted, Linux, aarch64]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build and Test
run: sh ./ci/linux/build-aarch64.sh
aarch64-macos: aarch64-macos:
runs-on: [self-hosted, macOS, aarch64] runs-on: [self-hosted, macOS, aarch64]
env: env:
@ -58,4 +54,13 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Build and Test - name: Build and Test
run: ./ci/macos/build-aarch64.sh run: ci/aarch64-macos.sh
x86_64-windows:
runs-on: windows-latest
env:
ARCH: "x86_64"
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build and Test
run: ci/x86_64-windows.ps1

66
ci/aarch64-linux-debug.sh Normal file
View File

@ -0,0 +1,66 @@
#!/bin/sh
# Requires cmake ninja-build
set -x
set -e
ARCH="$(uname -m)"
TARGET="$ARCH-linux-musl"
MCPU="baseline"
CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.11.0-dev.256+271cc52a1"
PREFIX="$HOME/deps/$CACHE_BASENAME"
ZIG="$PREFIX/bin/zig"
export PATH="$HOME/deps/wasmtime-v2.0.2-$ARCH-linux:$PATH"
# Make the `zig version` number consistent.
# This will affect the cmake command below.
git config core.abbrev 9
git fetch --unshallow || true
git fetch --tags
export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
rm -rf build-debug
mkdir build-debug
cd build-debug
cmake .. \
-DCMAKE_INSTALL_PREFIX="stage3-debug" \
-DCMAKE_PREFIX_PATH="$PREFIX" \
-DCMAKE_BUILD_TYPE=Debug \
-DZIG_TARGET_TRIPLE="$TARGET" \
-DZIG_TARGET_MCPU="$MCPU" \
-DZIG_STATIC=ON \
-GNinja
# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
# so that installation and testing do not get affected by them.
unset CC
unset CXX
ninja install
echo "Looking for non-conforming code formatting..."
stage3-debug/bin/zig fmt --check .. \
--exclude ../test/cases/ \
--exclude ../build-debug
# simultaneously test building self-hosted without LLVM and with 32-bit arm
stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf
# TODO: add -fqemu back to this line
stage3-debug/bin/zig build test docs \
-fwasmtime \
-Dstatic-llvm \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$(pwd)/../lib"
# Look for HTML errors.
tidy --drop-empty-elements no -qe ../zig-cache/langref.html
# Produce the experimental std lib documentation.
stage3-debug/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib

View File

@ -45,8 +45,7 @@ ninja install
echo "Looking for non-conforming code formatting..." echo "Looking for non-conforming code formatting..."
stage3-debug/bin/zig fmt --check .. \ stage3-debug/bin/zig fmt --check .. \
--exclude ../test/cases/ \ --exclude ../test/cases/ \
--exclude ../build-debug \ --exclude ../build-debug
--exclude ../build-release
# simultaneously test building self-hosted without LLVM and with 32-bit arm # simultaneously test building self-hosted without LLVM and with 32-bit arm
stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf