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:...@@ -52,8 +52,6 @@ jobs:
52 run: sh ci/aarch64-linux-release.sh52 run: sh ci/aarch64-linux-release.sh
53 aarch64-macos-debug:53 aarch64-macos-debug:
54 runs-on: [self-hosted, macOS, aarch64]54 runs-on: [self-hosted, macOS, aarch64]
55 env:
56 ARCH: "aarch64"
57 steps:55 steps:
58 - name: Checkout56 - name: Checkout
59 uses: actions/checkout@v457 uses: actions/checkout@v4
...@@ -61,8 +59,6 @@ jobs:...@@ -61,8 +59,6 @@ jobs:
61 run: ci/aarch64-macos-debug.sh59 run: ci/aarch64-macos-debug.sh
62 aarch64-macos-release:60 aarch64-macos-release:
63 runs-on: [self-hosted, macOS, aarch64]61 runs-on: [self-hosted, macOS, aarch64]
64 env:
65 ARCH: "aarch64"
66 steps:62 steps:
67 - name: Checkout63 - name: Checkout
68 uses: actions/checkout@v464 uses: actions/checkout@v4
...@@ -71,8 +67,6 @@ jobs:...@@ -71,8 +67,6 @@ jobs:
71 x86_64-windows-debug:67 x86_64-windows-debug:
72 timeout-minutes: 42068 timeout-minutes: 420
73 runs-on: [self-hosted, Windows, x86_64]69 runs-on: [self-hosted, Windows, x86_64]
74 env:
75 ARCH: "x86_64"
76 steps:70 steps:
77 - name: Checkout71 - name: Checkout
78 uses: actions/checkout@v472 uses: actions/checkout@v4
...@@ -81,8 +75,6 @@ jobs:...@@ -81,8 +75,6 @@ jobs:
81 x86_64-windows-release:75 x86_64-windows-release:
82 timeout-minutes: 42076 timeout-minutes: 420
83 runs-on: [self-hosted, Windows, x86_64]77 runs-on: [self-hosted, Windows, x86_64]
84 env:
85 ARCH: "x86_64"
86 steps:78 steps:
87 - name: Checkout79 - name: Checkout
88 uses: actions/checkout@v480 uses: actions/checkout@v4
ci/aarch64-linux-debug.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="aarch64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/aarch64-linux-release.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="aarch64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/aarch64-macos-debug.sh+1-1
...@@ -7,7 +7,7 @@ set -e...@@ -7,7 +7,7 @@ set -e
7# s3cmd7# s3cmd
88
9ZIGDIR="$PWD"9ZIGDIR="$PWD"
10TARGET="$ARCH-macos-none"10TARGET="aarch64-macos-none"
11MCPU="baseline"11MCPU="baseline"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
13PREFIX="$HOME/$CACHE_BASENAME"13PREFIX="$HOME/$CACHE_BASENAME"
ci/aarch64-macos-release.sh+1-1
...@@ -7,7 +7,7 @@ set -e...@@ -7,7 +7,7 @@ set -e
7# s3cmd7# s3cmd
88
9ZIGDIR="$PWD"9ZIGDIR="$PWD"
10TARGET="$ARCH-macos-none"10TARGET="aarch64-macos-none"
11MCPU="baseline"11MCPU="baseline"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
13PREFIX="$HOME/$CACHE_BASENAME"13PREFIX="$HOME/$CACHE_BASENAME"
ci/aarch64-windows.ps1+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1$TARGET = "$($Env:ARCH)-windows-gnu"1$TARGET = "aarch64-windows-gnu"
2$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"2$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
3$MCPU = "baseline"3$MCPU = "baseline"
4$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"4$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 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="loongarch64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/loongarch64-linux-release.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="loongarch64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/riscv64-linux-debug.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="riscv64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="spacemit_x60"9MCPU="spacemit_x60"
11CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/riscv64-linux-release.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="riscv64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="spacemit_x60"9MCPU="spacemit_x60"
11CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-freebsd-debug.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="x86_64"8TARGET="x86_64-freebsd-none"
9TARGET="$ARCH-freebsd-none"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-freebsd-release.sh+1-2
...@@ -5,8 +5,7 @@...@@ -5,8 +5,7 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="x86_64"8TARGET="x86_64-freebsd-none"
9TARGET="$ARCH-freebsd-none"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-linux-debug-llvm.sh+2-3
...@@ -5,14 +5,13 @@...@@ -5,14 +5,13 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="x86_64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
13ZIG="$PREFIX/bin/zig"12ZIG="$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
17# Make the `zig version` number consistent.16# Make the `zig version` number consistent.
18# This will affect the cmake command below.17# This will affect the cmake command below.
ci/x86_64-linux-debug.sh+2-3
...@@ -5,14 +5,13 @@...@@ -5,14 +5,13 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="x86_64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
13ZIG="$PREFIX/bin/zig"12ZIG="$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
17# Make the `zig version` number consistent.16# Make the `zig version` number consistent.
18# This will affect the cmake command below.17# This will affect the cmake command below.
ci/x86_64-linux-release.sh+2-3
...@@ -5,14 +5,13 @@...@@ -5,14 +5,13 @@
5set -x5set -x
6set -e6set -e
77
8ARCH="$(uname -m)"8TARGET="x86_64-linux-musl"
9TARGET="$ARCH-linux-musl"
10MCPU="baseline"9MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"10CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
12PREFIX="$HOME/deps/$CACHE_BASENAME"11PREFIX="$HOME/deps/$CACHE_BASENAME"
13ZIG="$PREFIX/bin/zig"12ZIG="$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
17# Make the `zig version` number consistent.16# Make the `zig version` number consistent.
18# This will affect the cmake command below.17# This will affect the cmake command below.
ci/x86_64-windows-debug.ps1+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1$TARGET = "$($Env:ARCH)-windows-gnu"1$TARGET = "x86_64-windows-gnu"
2$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"2$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
3$MCPU = "baseline"3$MCPU = "baseline"
4$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"4$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,4 +1,4 @@
1$TARGET = "$($Env:ARCH)-windows-gnu"1$TARGET = "x86_64-windows-gnu"
2$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"2$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
3$MCPU = "baseline"3$MCPU = "baseline"
4$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"4$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"