Commit 1cbfdb42449f25cf996f4492736dbf8722ab3f09 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2025-01-28 20:39:31+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-01-29 11:46:53-08:00
log	1cbfdb42449f25cf996f4492736dbf8722ab3f09
tree	7b339df4f5910fead95a3870b6eabb99cb4be7e7
parent	798bb0bc61284be3948272bb2085912534feb8bd

ci: Set ZIG_GLOBAL_CACHE_DIR and ZIG_LOCAL_CACHE_DIR earlier.

Otherwise the disk just keeps getting filled up.

Also remove some pointless cleanup commands since the actions/checkout workflow
step already cleans the repository by default.

10 files changed, 52 insertions(+), 80 deletions(-)

ci/aarch64-linux-debug.sh+6-10

...	...	@@ -19,19 +19,18 @@ export PATH="$HOME/local/bin:$PATH"
19	19	git fetch --unshallow \|\| true
20	20	git fetch --tags
21	21
22		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
23		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
24
25		rm -rf build-debug
26		mkdir build-debug
27		cd build-debug
28
29	22	# Override the cache directories because they won't actually help other CI runs
30	23	# which will be testing alternate versions of zig, and ultimately would just
31	24	# fill up space on the hard drive for no reason.
32	25	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
33	26	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
34	27
	28	mkdir build-debug
	29	cd build-debug
	30
	31	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
	32	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
	33
35	34	cmake .. \
36	35	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
37	36	-DCMAKE_PREFIX_PATH="$PREFIX" \
...	...	@@ -66,12 +65,9 @@ stage3-debug/bin/zig build test docs \
66	65	# Ensure that updating the wasm binary from this commit will result in a viable build.
67	66	stage3-debug/bin/zig build update-zig1
68	67
69		rm -rf ../build-new
70	68	mkdir ../build-new
71	69	cd ../build-new
72	70
73		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
74		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
75	71	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
76	72	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
77	73

ci/aarch64-linux-release.sh+6-10

...	...	@@ -19,19 +19,18 @@ export PATH="$HOME/local/bin:$PATH"
19	19	git fetch --unshallow \|\| true
20	20	git fetch --tags
21	21
22		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
23		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
24
25		rm -rf build-release
26		mkdir build-release
27		cd build-release
28
29	22	# Override the cache directories because they won't actually help other CI runs
30	23	# which will be testing alternate versions of zig, and ultimately would just
31	24	# fill up space on the hard drive for no reason.
32	25	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
33	26	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
34	27
	28	mkdir build-release
	29	cd build-release
	30
	31	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
	32	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
	33
35	34	cmake .. \
36	35	-DCMAKE_INSTALL_PREFIX="stage3-release" \
37	36	-DCMAKE_PREFIX_PATH="$PREFIX" \
...	...	@@ -82,12 +81,9 @@ diff stage3-release/bin/zig stage4-release/bin/zig
82	81	# Ensure that updating the wasm binary from this commit will result in a viable build.
83	82	stage3-release/bin/zig build update-zig1
84	83
85		rm -rf ../build-new
86	84	mkdir ../build-new
87	85	cd ../build-new
88	86
89		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
90		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
91	87	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
92	88	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
93	89

ci/aarch64-macos-debug.sh+3-4

...	...	@@ -26,16 +26,15 @@ cd $ZIGDIR
26	26	git fetch --unshallow \|\| true
27	27	git fetch --tags
28	28
29		rm -rf build-debug
30		mkdir build-debug
31		cd build-debug
32
33	29	# Override the cache directories because they won't actually help other CI runs
34	30	# which will be testing alternate versions of zig, and ultimately would just
35	31	# fill up space on the hard drive for no reason.
36	32	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
37	33	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
38	34
	35	mkdir build-debug
	36	cd build-debug
	37
39	38	PATH="$HOME/local/bin:$PATH" cmake .. \
40	39	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
41	40	-DCMAKE_PREFIX_PATH="$PREFIX" \

ci/aarch64-macos-release.sh+3-4

...	...	@@ -26,16 +26,15 @@ cd $ZIGDIR
26	26	git fetch --unshallow \|\| true
27	27	git fetch --tags
28	28
29		rm -rf build-release
30		mkdir build-release
31		cd build-release
32
33	29	# Override the cache directories because they won't actually help other CI runs
34	30	# which will be testing alternate versions of zig, and ultimately would just
35	31	# fill up space on the hard drive for no reason.
36	32	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
37	33	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
38	34
	35	mkdir build-release
	36	cd build-release
	37
39	38	PATH="$HOME/local/bin:$PATH" cmake .. \
40	39	-DCMAKE_INSTALL_PREFIX="stage3-release" \
41	40	-DCMAKE_PREFIX_PATH="$PREFIX" \

ci/aarch64-windows.ps1+4-5

...	...	@@ -30,17 +30,16 @@ if ((git rev-parse --is-shallow-repository) -eq "true") {
30	30	git fetch --unshallow # `git describe` won't work on a shallow repo
31	31	}
32	32
33		Write-Output "Building from source..."
34		Remove-Item -Path 'build-release' -Recurse -Force -ErrorAction Ignore
35		New-Item -Path 'build-release' -ItemType Directory
36		Set-Location -Path 'build-release'
37
38	33	# Override the cache directories because they won't actually help other CI runs
39	34	# which will be testing alternate versions of zig, and ultimately would just
40	35	# fill up space on the hard drive for no reason.
41	36	$Env:ZIG_GLOBAL_CACHE_DIR="$(Get-Location)\zig-global-cache"
42	37	$Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
43	38
	39	Write-Output "Building from source..."
	40	New-Item -Path 'build-release' -ItemType Directory
	41	Set-Location -Path 'build-release'
	42
44	43	# CMake gives a syntax error when file paths with backward slashes are used.
45	44	# Here, we use forward slashes only to work around this.
46	45	& cmake .. `

ci/x86_64-linux-debug.sh+8-14

...	...	@@ -19,26 +19,23 @@ export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_6
19	19	git fetch --unshallow \|\| true
20	20	git fetch --tags
21	21
	22	# Override the cache directories because they won't actually help other CI runs
	23	# which will be testing alternate versions of zig, and ultimately would just
	24	# fill up space on the hard drive for no reason.
	25	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	26	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
	27
22	28	# Test building from source without LLVM.
23		git clean -fd
24		rm -rf zig-out
25	29	cc -o bootstrap bootstrap.c
26	30	./bootstrap
27	31	./zig2 build -Dno-lib
28	32	./zig-out/bin/zig test test/behavior.zig
29	33
30		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
31		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
32
33		rm -rf build-debug
34	34	mkdir build-debug
35	35	cd build-debug
36	36
37		# Override the cache directories because they won't actually help other CI runs
38		# which will be testing alternate versions of zig, and ultimately would just
39		# fill up space on the hard drive for no reason.
40		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
41		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
	37	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
	38	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
42	39
43	40	cmake .. \
44	41	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
...	...	@@ -76,12 +73,9 @@ stage3-debug/bin/zig build test docs \
76	73	# Ensure that updating the wasm binary from this commit will result in a viable build.
77	74	stage3-debug/bin/zig build update-zig1
78	75
79		rm -rf ../build-new
80	76	mkdir ../build-new
81	77	cd ../build-new
82	78
83		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
84		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
85	79	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
86	80	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
87	81

ci/x86_64-linux-release.sh+8-14

...	...	@@ -19,26 +19,23 @@ export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_6
19	19	git fetch --unshallow \|\| true
20	20	git fetch --tags
21	21
	22	# Override the cache directories because they won't actually help other CI runs
	23	# which will be testing alternate versions of zig, and ultimately would just
	24	# fill up space on the hard drive for no reason.
	25	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	26	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
	27
22	28	# Test building from source without LLVM.
23		git clean -fd
24		rm -rf zig-out
25	29	cc -o bootstrap bootstrap.c
26	30	./bootstrap
27	31	./zig2 build -Dno-lib
28	32	./zig-out/bin/zig test test/behavior.zig
29	33
30		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
31		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
32
33		rm -rf build-release
34	34	mkdir build-release
35	35	cd build-release
36	36
37		# Override the cache directories because they won't actually help other CI runs
38		# which will be testing alternate versions of zig, and ultimately would just
39		# fill up space on the hard drive for no reason.
40		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
41		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
	37	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
	38	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
42	39
43	40	cmake .. \
44	41	-DCMAKE_INSTALL_PREFIX="stage3-release" \
...	...	@@ -92,12 +89,9 @@ diff stage3-release/bin/zig stage4-release/bin/zig
92	89	# Ensure that updating the wasm binary from this commit will result in a viable build.
93	90	stage3-release/bin/zig build update-zig1
94	91
95		rm -rf ../build-new
96	92	mkdir ../build-new
97	93	cd ../build-new
98	94
99		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
100		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
101	95	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
102	96	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
103	97

ci/x86_64-macos-release.sh+6-9

...	...	@@ -24,24 +24,21 @@ cd $ZIGDIR
24	24	git fetch --unshallow \|\| true
25	25	git fetch --tags
26	26
	27	# Override the cache directories because they won't actually help other CI runs
	28	# which will be testing alternate versions of zig, and ultimately would just
	29	# fill up space on the hard drive for no reason.
	30	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	31	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
	32
27	33	# Test building from source without LLVM.
28		git clean -fd
29		rm -rf zig-out
30	34	cc -o bootstrap bootstrap.c
31	35	./bootstrap
32	36	./zig2 build -Dno-lib
33	37	./zig-out/bin/zig test test/behavior.zig
34	38
35		rm -rf build
36	39	mkdir build
37	40	cd build
38	41
39		# Override the cache directories because they won't actually help other CI runs
40		# which will be testing alternate versions of zig, and ultimately would just
41		# fill up space on the hard drive for no reason.
42		export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
43		export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
44
45	42	cmake .. \
46	43	-DCMAKE_PREFIX_PATH="$PREFIX" \
47	44	-DCMAKE_BUILD_TYPE=Release \

ci/x86_64-windows-debug.ps1+4-5

...	...	@@ -30,17 +30,16 @@ if ((git rev-parse --is-shallow-repository) -eq "true") {
30	30	git fetch --unshallow # `git describe` won't work on a shallow repo
31	31	}
32	32
33		Write-Output "Building from source..."
34		Remove-Item -Path 'build-debug' -Recurse -Force -ErrorAction Ignore
35		New-Item -Path 'build-debug' -ItemType Directory
36		Set-Location -Path 'build-debug'
37
38	33	# Override the cache directories because they won't actually help other CI runs
39	34	# which will be testing alternate versions of zig, and ultimately would just
40	35	# fill up space on the hard drive for no reason.
41	36	$Env:ZIG_GLOBAL_CACHE_DIR="$(Get-Location)\zig-global-cache"
42	37	$Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
43	38
	39	Write-Output "Building from source..."
	40	New-Item -Path 'build-debug' -ItemType Directory
	41	Set-Location -Path 'build-debug'
	42
44	43	# CMake gives a syntax error when file paths with backward slashes are used.
45	44	# Here, we use forward slashes only to work around this.
46	45	& cmake .. `

ci/x86_64-windows-release.ps1+4-5

...	...	@@ -30,17 +30,16 @@ if ((git rev-parse --is-shallow-repository) -eq "true") {
30	30	git fetch --unshallow # `git describe` won't work on a shallow repo
31	31	}
32	32
33		Write-Output "Building from source..."
34		Remove-Item -Path 'build-release' -Recurse -Force -ErrorAction Ignore
35		New-Item -Path 'build-release' -ItemType Directory
36		Set-Location -Path 'build-release'
37
38	33	# Override the cache directories because they won't actually help other CI runs
39	34	# which will be testing alternate versions of zig, and ultimately would just
40	35	# fill up space on the hard drive for no reason.
41	36	$Env:ZIG_GLOBAL_CACHE_DIR="$(Get-Location)\zig-global-cache"
42	37	$Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
43	38
	39	Write-Output "Building from source..."
	40	New-Item -Path 'build-release' -ItemType Directory
	41	Set-Location -Path 'build-release'
	42
44	43	# CMake gives a syntax error when file paths with backward slashes are used.
45	44	# Here, we use forward slashes only to work around this.
46	45	& cmake .. `