Commit acf8d5234f

Alex Rønne Petersen <alex@alexrp.com>
2025-09-28 19:39:22
ci: stop requiring an ARCH environment variable to be set
master
1 parent 9327aae
Changed files (17)
.github
workflows
ci.yaml
ci
aarch64-linux-debug.sh
aarch64-linux-release.sh
aarch64-macos-debug.sh
aarch64-macos-release.sh
aarch64-windows.ps1
loongarch64-linux-debug.sh
loongarch64-linux-release.sh
riscv64-linux-debug.sh
riscv64-linux-release.sh
x86_64-freebsd-debug.sh
x86_64-freebsd-release.sh
x86_64-linux-debug-llvm.sh
x86_64-linux-debug.sh
x86_64-linux-release.sh
x86_64-windows-debug.ps1
x86_64-windows-release.ps1
.github/workflows/ci.yaml
@@ -52,8 +52,6 @@ jobs:
         run: sh ci/aarch64-linux-release.sh
   aarch64-macos-debug:
     runs-on: [self-hosted, macOS, aarch64]
-    env:
-      ARCH: "aarch64"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,8 +59,6 @@ jobs:
         run: ci/aarch64-macos-debug.sh
   aarch64-macos-release:
     runs-on: [self-hosted, macOS, aarch64]
-    env:
-      ARCH: "aarch64"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -71,8 +67,6 @@ jobs:
   x86_64-windows-debug:
     timeout-minutes: 420
     runs-on: [self-hosted, Windows, x86_64]
-    env:
-      ARCH: "x86_64"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -81,8 +75,6 @@ jobs:
   x86_64-windows-release:
     timeout-minutes: 420
     runs-on: [self-hosted, Windows, x86_64]
-    env:
-      ARCH: "x86_64"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
ci/aarch64-linux-debug.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="aarch64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/aarch64-linux-release.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="aarch64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/aarch64-macos-debug.sh
@@ -7,7 +7,7 @@ set -e
 # s3cmd
 
 ZIGDIR="$PWD"
-TARGET="$ARCH-macos-none"
+TARGET="aarch64-macos-none"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/$CACHE_BASENAME"
ci/aarch64-macos-release.sh
@@ -7,7 +7,7 @@ set -e
 # s3cmd
 
 ZIGDIR="$PWD"
-TARGET="$ARCH-macos-none"
+TARGET="aarch64-macos-none"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/$CACHE_BASENAME"
ci/aarch64-windows.ps1
@@ -1,4 +1,4 @@
-$TARGET = "$($Env:ARCH)-windows-gnu"
+$TARGET = "aarch64-windows-gnu"
 $ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 $MCPU = "baseline"
 $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
ci/loongarch64-linux-debug.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="loongarch64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/loongarch64-linux-release.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="loongarch64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.157+7fdd60df1"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/riscv64-linux-debug.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="riscv64-linux-musl"
 MCPU="spacemit_x60"
 CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/riscv64-linux-release.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="riscv64-linux-musl"
 MCPU="spacemit_x60"
 CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-freebsd-debug.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="x86_64"
-TARGET="$ARCH-freebsd-none"
+TARGET="x86_64-freebsd-none"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-freebsd-release.sh
@@ -5,8 +5,7 @@
 set -x
 set -e
 
-ARCH="x86_64"
-TARGET="$ARCH-freebsd-none"
+TARGET="x86_64-freebsd-none"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
ci/x86_64-linux-debug-llvm.sh
@@ -5,14 +5,13 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="x86_64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
 ZIG="$PREFIX/bin/zig"
 
-export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
+export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
 
 # Make the `zig version` number consistent.
 # This will affect the cmake command below.
ci/x86_64-linux-debug.sh
@@ -5,14 +5,13 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="x86_64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
 ZIG="$PREFIX/bin/zig"
 
-export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
+export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
 
 # Make the `zig version` number consistent.
 # This will affect the cmake command below.
ci/x86_64-linux-release.sh
@@ -5,14 +5,13 @@
 set -x
 set -e
 
-ARCH="$(uname -m)"
-TARGET="$ARCH-linux-musl"
+TARGET="x86_64-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
 ZIG="$PREFIX/bin/zig"
 
-export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
+export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.0/bin:$HOME/local/bin:$PATH"
 
 # Make the `zig version` number consistent.
 # This will affect the cmake command below.
ci/x86_64-windows-debug.ps1
@@ -1,4 +1,4 @@
-$TARGET = "$($Env:ARCH)-windows-gnu"
+$TARGET = "x86_64-windows-gnu"
 $ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 $MCPU = "baseline"
 $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
ci/x86_64-windows-release.ps1
@@ -1,4 +1,4 @@
-$TARGET = "$($Env:ARCH)-windows-gnu"
+$TARGET = "x86_64-windows-gnu"
 $ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
 $MCPU = "baseline"
 $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"