authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-09-28 19:39:22+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-10-01 13:00:22+02:00
logacf8d5234fdb86b23e37761f3f58505f6247a28c
tree8f091ea2594115414e5ffb3cb9cf4fc11ccadfc7
parent9327aaefb651fdb584473ff8a4cc4fd5cb55cd51
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

ci: stop requiring an ARCH environment variable to be set

17 files changed, 19 insertions(+), 38 deletions(-)

.github/workflows/ci.yaml-8
......@@ -52,8 +52,6 @@ jobs:
5252 run: sh ci/aarch64-linux-release.sh
5353 aarch64-macos-debug:
5454 runs-on: [self-hosted, macOS, aarch64]
55 env:
56 ARCH: "aarch64"
5755 steps:
5856 - name: Checkout
5957 uses: actions/checkout@v4
......@@ -61,8 +59,6 @@ jobs:
6159 run: ci/aarch64-macos-debug.sh
6260 aarch64-macos-release:
6361 runs-on: [self-hosted, macOS, aarch64]
64 env:
65 ARCH: "aarch64"
6662 steps:
6763 - name: Checkout
6864 uses: actions/checkout@v4
......@@ -71,8 +67,6 @@ jobs:
7167 x86_64-windows-debug:
7268 timeout-minutes: 420
7369 runs-on: [self-hosted, Windows, x86_64]
74 env:
75 ARCH: "x86_64"
7670 steps:
7771 - name: Checkout
7872 uses: actions/checkout@v4
......@@ -81,8 +75,6 @@ jobs:
8175 x86_64-windows-release:
8276 timeout-minutes: 420
8377 runs-on: [self-hosted, Windows, x86_64]
84 env:
85 ARCH: "x86_64"
8678 steps:
8779 - name: Checkout
8880 uses: actions/checkout@v4
ci/aarch64-linux-debug.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="aarch64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/aarch64-linux-release.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="aarch64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/aarch64-macos-debug.sh+1-1
......@@ -7,7 +7,7 @@ set -e
77# s3cmd
88
99ZIGDIR="$PWD"
10TARGET="$ARCH-macos-none"
10TARGET="aarch64-macos-none"
1111MCPU="baseline"
1212CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1313PREFIX="$HOME/$CACHE_BASENAME"
ci/aarch64-macos-release.sh+1-1
......@@ -7,7 +7,7 @@ set -e
77# s3cmd
88
99ZIGDIR="$PWD"
10TARGET="$ARCH-macos-none"
10TARGET="aarch64-macos-none"
1111MCPU="baseline"
1212CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1313PREFIX="$HOME/$CACHE_BASENAME"
ci/aarch64-windows.ps1+1-1
......@@ -1,4 +1,4 @@
1$TARGET = "$($Env:ARCH)-windows-gnu"
1$TARGET = "aarch64-windows-gnu"
22$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
33$MCPU = "baseline"
44$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
ci/loongarch64-linux-debug.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="loongarch64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/loongarch64-linux-release.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="loongarch64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/riscv64-linux-debug.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="riscv64-linux-musl"
109MCPU="spacemit_x60"
1110CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/riscv64-linux-release.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="riscv64-linux-musl"
109MCPU="spacemit_x60"
1110CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-freebsd-debug.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="x86_64"
9TARGET="$ARCH-freebsd-none"
8TARGET="x86_64-freebsd-none"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-freebsd-release.sh+1-2
......@@ -5,8 +5,7 @@
55set -x
66set -e
77
8ARCH="x86_64"
9TARGET="$ARCH-freebsd-none"
8TARGET="x86_64-freebsd-none"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-linux-debug-llvm.sh+2-3
......@@ -5,14 +5,13 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="x86_64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
1312ZIG="$PREFIX/bin/zig"
1413
15export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
14export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
1615
1716# Make the `zig version` number consistent.
1817# This will affect the cmake command below.
ci/x86_64-linux-debug.sh+2-3
......@@ -5,14 +5,13 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="x86_64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
1312ZIG="$PREFIX/bin/zig"
1413
15export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
14export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
1615
1716# Make the `zig version` number consistent.
1817# This will affect the cmake command below.
ci/x86_64-linux-release.sh+2-3
......@@ -5,14 +5,13 @@
55set -x
66set -e
77
8ARCH="$(uname -m)"
9TARGET="$ARCH-linux-musl"
8TARGET="x86_64-linux-musl"
109MCPU="baseline"
1110CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211PREFIX="$HOME/deps/$CACHE_BASENAME"
1312ZIG="$PREFIX/bin/zig"
1413
15export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
14export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
1615
1716# Make the `zig version` number consistent.
1817# This will affect the cmake command below.
ci/x86_64-windows-debug.ps1+1-1
......@@ -1,4 +1,4 @@
1$TARGET = "$($Env:ARCH)-windows-gnu"
1$TARGET = "x86_64-windows-gnu"
22$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
33$MCPU = "baseline"
44$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
ci/x86_64-windows-release.ps1+1-1
......@@ -1,4 +1,4 @@
1$TARGET = "$($Env:ARCH)-windows-gnu"
1$TARGET = "x86_64-windows-gnu"
22$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
33$MCPU = "baseline"
44$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"