From a644be7ee0ae6d34edf009f4f837ef126e888925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Wed, 9 Sep 2026 13:38:31 +0200 Subject: [PATCH] ci: add $HOME/local/bin to PATH in all scripts Not strictly needed, but: 1. It makes the scripts easier to diff. 2. It makes adding local binaries easier. --- ci/aarch64-freebsd-debug.sh | 2 ++ ci/aarch64-freebsd-release.sh | 2 ++ ci/aarch64-macos-debug.sh | 5 +++-- ci/aarch64-macos-release.sh | 5 +++-- ci/aarch64-netbsd-debug.sh | 2 ++ ci/aarch64-netbsd-release.sh | 2 ++ ci/aarch64-openbsd-debug.sh | 2 ++ ci/aarch64-openbsd-release.sh | 2 ++ ci/aarch64-windows-debug.ps1 | 2 ++ ci/aarch64-windows-release.ps1 | 2 ++ ci/loongarch64-linux-debug.sh | 2 ++ ci/loongarch64-linux-release.sh | 2 ++ ci/powerpc64le-linux-debug.sh | 2 ++ ci/powerpc64le-linux-release.sh | 2 ++ ci/riscv64-linux-debug.sh | 2 ++ ci/riscv64-linux-release.sh | 2 ++ ci/s390x-linux-debug.sh | 2 ++ ci/s390x-linux-release.sh | 2 ++ ci/x86_64-freebsd-debug.sh | 2 ++ ci/x86_64-freebsd-release.sh | 2 ++ ci/x86_64-netbsd-debug.sh | 2 ++ ci/x86_64-netbsd-release.sh | 2 ++ ci/x86_64-openbsd-debug.sh | 2 ++ ci/x86_64-openbsd-release.sh | 2 ++ ci/x86_64-windows-debug.ps1 | 2 ++ ci/x86_64-windows-release.ps1 | 2 ++ 26 files changed, 54 insertions(+), 4 deletions(-) diff --git a/ci/aarch64-freebsd-debug.sh b/ci/aarch64-freebsd-debug.sh index 73bcf5580a3c1541a6ec2238164f33d54b6a3062..71587595e766c031cc3ed50318637402020b24f2 100755 --- a/ci/aarch64-freebsd-debug.sh +++ b/ci/aarch64-freebsd-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-freebsd-release.sh b/ci/aarch64-freebsd-release.sh index 244e0f88ecb0162bc6d33be9d4259835496ea9c1..5305c3d81bead6815a24b44839e7a3348a0e7761 100755 --- a/ci/aarch64-freebsd-release.sh +++ b/ci/aarch64-freebsd-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-macos-debug.sh b/ci/aarch64-macos-debug.sh index 325f8fdddd41c932682a4057e724dbdc79528e5c..635dc8955eedc8d981e93552a8716ac41f41e4ce 100755 --- a/ci/aarch64-macos-debug.sh +++ b/ci/aarch64-macos-debug.sh @@ -5,21 +5,22 @@ set -x set -e -ZIGDIR="$PWD" TARGET="aarch64-macos-none" MCPU="baseline" CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +ZIGDIR="$PWD" if [ ! -d "$PREFIX" ]; then cd $HOME curl -L -O "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz" tar xf "$CACHE_BASENAME.tar.xz" fi - cd $ZIGDIR +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-macos-release.sh b/ci/aarch64-macos-release.sh index 31a1593b61ccab3c3ef8ca31e6963d29b35cf449..b1d7c9cba2f4391d1e5a6e97dcc261fa6b86a813 100755 --- a/ci/aarch64-macos-release.sh +++ b/ci/aarch64-macos-release.sh @@ -5,21 +5,22 @@ set -x set -e -ZIGDIR="$PWD" TARGET="aarch64-macos-none" MCPU="baseline" CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +ZIGDIR="$PWD" if [ ! -d "$PREFIX" ]; then cd $HOME curl -L -O "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz" tar xf "$CACHE_BASENAME.tar.xz" fi - cd $ZIGDIR +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-netbsd-debug.sh b/ci/aarch64-netbsd-debug.sh index 56427a59b90a6e96a81a955875e45880505f4f54..d275f3b19721ea3f1aa628460a5f427bb846eb33 100755 --- a/ci/aarch64-netbsd-debug.sh +++ b/ci/aarch64-netbsd-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-netbsd-release.sh b/ci/aarch64-netbsd-release.sh index e7bb3f31965caf9557cbb3fcc5df67cd38eab3bd..49d51c00476318a1a2769794f74fcb0f512bf536 100755 --- a/ci/aarch64-netbsd-release.sh +++ b/ci/aarch64-netbsd-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-openbsd-debug.sh b/ci/aarch64-openbsd-debug.sh index c2d781bcf172e0858545e7e2e5f04776e6482209..74808aa44a054f1838e0226739db8cdc8781fe93 100755 --- a/ci/aarch64-openbsd-debug.sh +++ b/ci/aarch64-openbsd-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.2030+f955266cf" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-openbsd-release.sh b/ci/aarch64-openbsd-release.sh index ec94f38daee29aa26b85f167d2a539f0ff3cdafb..00da968e3501080d4295a8bbd0437ad4e250b406 100755 --- a/ci/aarch64-openbsd-release.sh +++ b/ci/aarch64-openbsd-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.2030+f955266cf" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/aarch64-windows-debug.ps1 b/ci/aarch64-windows-debug.ps1 index 92f415bde1eeaf4d1e3978ecf057caf52f9d9010..b031bed87a8d2ca1d79a641fcfd42cb68bd24434 100644 --- a/ci/aarch64-windows-debug.ps1 +++ b/ci/aarch64-windows-debug.ps1 @@ -4,6 +4,8 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.2 $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 } +$Env:PATH = "$($Env:USERPROFILE)\local\bin;$Env:PATH" + function CheckLastExitCode { if (!$?) { exit 1 diff --git a/ci/aarch64-windows-release.ps1 b/ci/aarch64-windows-release.ps1 index 051e92f218a5e7d83d7d107ceccbfd33823038d8..6db16d463b66a0ab7da1b3f3674a1c93f8cd0ba8 100644 --- a/ci/aarch64-windows-release.ps1 +++ b/ci/aarch64-windows-release.ps1 @@ -4,6 +4,8 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.2 $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 } +$Env:PATH = "$($Env:USERPROFILE)\local\bin;$Env:PATH" + function CheckLastExitCode { if (!$?) { exit 1 diff --git a/ci/loongarch64-linux-debug.sh b/ci/loongarch64-linux-debug.sh index db157146ce092fe9ea298bca039e4035089fd77d..5f2755dc194d566f77cf8646a21070815003673e 100755 --- a/ci/loongarch64-linux-debug.sh +++ b/ci/loongarch64-linux-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/loongarch64-linux-release.sh b/ci/loongarch64-linux-release.sh index 773058f487021a9ba7efac8bab20f9d12d7ba3ff..62517fd21199245c9384d1f0882d52ff2c9aed9f 100755 --- a/ci/loongarch64-linux-release.sh +++ b/ci/loongarch64-linux-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/powerpc64le-linux-debug.sh b/ci/powerpc64le-linux-debug.sh index 637d0598032eaa5e1a54249c8077340960112392..7956b46a57eaa579867fed61d3f5b3ba869ab071 100755 --- a/ci/powerpc64le-linux-debug.sh +++ b/ci/powerpc64le-linux-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/powerpc64le-linux-release.sh b/ci/powerpc64le-linux-release.sh index 438a2ad7d17a15c10f461f7ff778d6bebef4209b..406559ac7f4468ac7b20d3ac325398662ce29d4c 100755 --- a/ci/powerpc64le-linux-release.sh +++ b/ci/powerpc64le-linux-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/riscv64-linux-debug.sh b/ci/riscv64-linux-debug.sh index ba9d13f5a869e8d10f3ed02fee8c0f91d6b8d719..ccdaf7158e50af43bb50d5a358f226371b919cb1 100755 --- a/ci/riscv64-linux-debug.sh +++ b/ci/riscv64-linux-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/riscv64-linux-release.sh b/ci/riscv64-linux-release.sh index 0e8d91a3dbb19974264567ac4d228de500c1ca7f..453764d4de145995a0dc51ba248576b1693646af 100755 --- a/ci/riscv64-linux-release.sh +++ b/ci/riscv64-linux-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/s390x-linux-debug.sh b/ci/s390x-linux-debug.sh index d80c254bd5e3b908ecd0c53af8f556349474854d..1900235f866060354764202c806984e197c0e4a2 100755 --- a/ci/s390x-linux-debug.sh +++ b/ci/s390x-linux-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/s390x-linux-release.sh b/ci/s390x-linux-release.sh index b25f6e481c4f3d3739f4d6d9a7dad8590827fb38..6955f328c06f581f39bd83ad69b0394370360e63 100755 --- a/ci/s390x-linux-release.sh +++ b/ci/s390x-linux-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh index 68e55d67b589f81eee10eb289dc623cd62a44a3e..5ba7279812bd55026625bc34df353fd6046a0e00 100755 --- a/ci/x86_64-freebsd-debug.sh +++ b/ci/x86_64-freebsd-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh index 49698e3b613d404f747fe0eb523029e9949dadfd..064c72958313f10298b831fe16a5f364c7a78a33 100755 --- a/ci/x86_64-freebsd-release.sh +++ b/ci/x86_64-freebsd-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-netbsd-debug.sh b/ci/x86_64-netbsd-debug.sh index e6494583b2af19d40ef8b7575295db320035f318..c463dcf3c2a92939dcbf7d98e8f095a05fbbd6b7 100755 --- a/ci/x86_64-netbsd-debug.sh +++ b/ci/x86_64-netbsd-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-netbsd-release.sh b/ci/x86_64-netbsd-release.sh index 7ce0d40f6dba11b25c27411211334b891ee73abb..b78b6646179ffcab4de402e2f3bd2b64764b5c9f 100755 --- a/ci/x86_64-netbsd-release.sh +++ b/ci/x86_64-netbsd-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-openbsd-debug.sh b/ci/x86_64-openbsd-debug.sh index e46b99b2f2616fe657573b405afcf2bee2991074..b51b93e8adf0376ad8dd14364a0ace3d859e4e28 100755 --- a/ci/x86_64-openbsd-debug.sh +++ b/ci/x86_64-openbsd-debug.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-openbsd-release.sh b/ci/x86_64-openbsd-release.sh index 101e7814020aca93caffda9239f0c3b1f00fc86e..58e1d7bfbab0b0488d03f515e7f4823bfc892660 100755 --- a/ci/x86_64-openbsd-release.sh +++ b/ci/x86_64-openbsd-release.sh @@ -11,6 +11,8 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +export PATH="$HOME/local/bin:$PATH" + # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just # fill up space on the hard drive for no reason. diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index 66557cc74157a21f46ea6585fc594871e24ee0c1..ba86acfdbddc0b2daf3bec7ecee1624c29b6ba10 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -4,6 +4,8 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.2 $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 } +$Env:PATH = "$($Env:USERPROFILE)\local\bin;$Env:PATH" + function CheckLastExitCode { if (!$?) { exit 1 diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index fc9fb979306874854105cd629f69fb8a758995fc..3a2ae878699e3c4108471dadf309866fa59fd757 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -4,6 +4,8 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.2 $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 } +$Env:PATH = "$($Env:USERPROFILE)\local\bin;$Env:PATH" + function CheckLastExitCode { if (!$?) { exit 1 -- 2.54.0