Commit 71ccdb5a66da500f8447018553ff0ac32e55face | zig

author	Jacob Young <jacobly@ziglang.org> 2024-04-13 23:12:52-04:00
committer	Jacob Young <jacobly@ziglang.org> 2024-04-14 21:26:09-04:00
log	71ccdb5a66da500f8447018553ff0ac32e55face
tree	b1f883c456f4fc38b59cb2bea188ea5dad777030
parent	425e38b6e0601e12329f93b2e94c76c1da300b8e

ci: add self-hosted x86_64 windows

10 files changed, 48 insertions(+), 62 deletions(-)

.github
- workflows
  - ci.yaml
ci

.github/workflows/ci.yaml+2-2

...	...	@@ -69,7 +69,7 @@ jobs:
69	69	- name: Build and Test
70	70	run: ci/aarch64-macos-release.sh
71	71	x86_64-windows-debug:
72		runs-on: windows-latest
	72	runs-on: [self-hosted, Windows, x86_64]
73	73	env:
74	74	ARCH: "x86_64"
75	75	steps:
...	...	@@ -78,7 +78,7 @@ jobs:
78	78	- name: Build and Test
79	79	run: ci/x86_64-windows-debug.ps1
80	80	x86_64-windows-release:
81		runs-on: windows-latest
	81	runs-on: [self-hosted, Windows, x86_64]
82	82	env:
83	83	ARCH: "x86_64"
84	84	steps:

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

...	...	@@ -29,8 +29,8 @@ cd build-debug
29	29	# Override the cache directories because they won't actually help other CI runs
30	30	# which will be testing alternate versions of zig, and ultimately would just
31	31	# fill up space on the hard drive for no reason.
32		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
33		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	32	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	33	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
34	34
35	35	cmake .. \
36	36	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
...	...	@@ -67,7 +67,7 @@ stage3-debug/bin/zig build test docs \
67	67	-Dstatic-llvm \
68	68	-Dtarget=native-native-musl \
69	69	--search-prefix "$PREFIX" \
70		--zig-lib-dir "$(pwd)/../lib"
	70	--zig-lib-dir "$PWD/../lib"
71	71
72	72	# Look for HTML errors.
73	73	# TODO: move this to a build.zig flag (-Denable-tidy)
...	...	@@ -80,8 +80,8 @@ rm -rf ../build-new
80	80	mkdir ../build-new
81	81	cd ../build-new
82	82
83		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
84		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	83	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	84	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
85	85	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
86	86	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
87	87
...	...	@@ -105,5 +105,5 @@ stage3/bin/zig build -p stage4 \
105	105	-Dtarget=native-native-musl \
106	106	-Dno-lib \
107	107	--search-prefix "$PREFIX" \
108		--zig-lib-dir "$(pwd)/../lib"
	108	--zig-lib-dir "$PWD/../lib"
109	109	stage4/bin/zig test ../test/behavior.zig

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

...	...	@@ -29,8 +29,8 @@ cd build-release
29	29	# Override the cache directories because they won't actually help other CI runs
30	30	# which will be testing alternate versions of zig, and ultimately would just
31	31	# fill up space on the hard drive for no reason.
32		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
33		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	32	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	33	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
34	34
35	35	cmake .. \
36	36	-DCMAKE_INSTALL_PREFIX="stage3-release" \
...	...	@@ -67,7 +67,7 @@ stage3-release/bin/zig build test docs \
67	67	-Dstatic-llvm \
68	68	-Dtarget=native-native-musl \
69	69	--search-prefix "$PREFIX" \
70		--zig-lib-dir "$(pwd)/../lib"
	70	--zig-lib-dir "$PWD/../lib"
71	71
72	72	# Look for HTML errors.
73	73	# TODO: move this to a build.zig flag (-Denable-tidy)
...	...	@@ -80,8 +80,8 @@ rm -rf ../build-new
80	80	mkdir ../build-new
81	81	cd ../build-new
82	82
83		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
84		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	83	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	84	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
85	85	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
86	86	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
87	87
...	...	@@ -105,5 +105,5 @@ stage3/bin/zig build -p stage4 \
105	105	-Dtarget=native-native-musl \
106	106	-Dno-lib \
107	107	--search-prefix "$PREFIX" \
108		--zig-lib-dir "$(pwd)/../lib"
	108	--zig-lib-dir "$PWD/../lib"
109	109	stage4/bin/zig test ../test/behavior.zig

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

...	...	@@ -6,7 +6,7 @@ set -e
6	6	# Script assumes the presence of the following:
7	7	# s3cmd
8	8
9		ZIGDIR="$(pwd)"
	9	ZIGDIR="$PWD"
10	10	TARGET="$ARCH-macos-none"
11	11	MCPU="baseline"
12	12	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.12.0-dev.467+0345d7866"
...	...	@@ -26,8 +26,8 @@ cd build
26	26	# Override the cache directories because they won't actually help other CI runs
27	27	# which will be testing alternate versions of zig, and ultimately would just
28	28	# fill up space on the hard drive for no reason.
29		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
30		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	29	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	30	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
31	31
32	32	PATH="$HOME/local/bin:$PATH" cmake .. \
33	33	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
...	...	@@ -44,7 +44,7 @@ PATH="$HOME/local/bin:$PATH" cmake .. \
44	44	$HOME/local/bin/ninja install
45	45
46	46	stage3-debug/bin/zig build test docs \
47		--zig-lib-dir "$(pwd)/../lib" \
	47	--zig-lib-dir "$PWD/../lib" \
48	48	-Denable-macos-sdk \
49	49	-Dstatic-llvm \
50	50	-Dskip-non-native \

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

...	...	@@ -6,7 +6,7 @@ set -e
6	6	# Script assumes the presence of the following:
7	7	# s3cmd
8	8
9		ZIGDIR="$(pwd)"
	9	ZIGDIR="$PWD"
10	10	TARGET="$ARCH-macos-none"
11	11	MCPU="baseline"
12	12	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.12.0-dev.467+0345d7866"
...	...	@@ -26,8 +26,8 @@ cd build
26	26	# Override the cache directories because they won't actually help other CI runs
27	27	# which will be testing alternate versions of zig, and ultimately would just
28	28	# fill up space on the hard drive for no reason.
29		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
30		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	29	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	30	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
31	31
32	32	PATH="$HOME/local/bin:$PATH" cmake .. \
33	33	-DCMAKE_INSTALL_PREFIX="stage3-release" \
...	...	@@ -44,7 +44,7 @@ PATH="$HOME/local/bin:$PATH" cmake .. \
44	44	$HOME/local/bin/ninja install
45	45
46	46	stage3-release/bin/zig build test docs \
47		--zig-lib-dir "$(pwd)/../lib" \
	47	--zig-lib-dir "$PWD/../lib" \
48	48	-Denable-macos-sdk \
49	49	-Dstatic-llvm \
50	50	-Dskip-non-native \

ci/x86_64-linux-debug.sh+6-6

...	...	@@ -37,8 +37,8 @@ cd build-debug
37	37	# Override the cache directories because they won't actually help other CI runs
38	38	# which will be testing alternate versions of zig, and ultimately would just
39	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"
	40	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	41	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
42	42
43	43	cmake .. \
44	44	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
...	...	@@ -75,7 +75,7 @@ stage3-debug/bin/zig build test docs \
75	75	-Dstatic-llvm \
76	76	-Dtarget=native-native-musl \
77	77	--search-prefix "$PREFIX" \
78		--zig-lib-dir "$(pwd)/../lib"
	78	--zig-lib-dir "$PWD/../lib"
79	79
80	80	# Look for HTML errors.
81	81	# TODO: move this to a build.zig flag (-Denable-tidy)
...	...	@@ -88,8 +88,8 @@ rm -rf ../build-new
88	88	mkdir ../build-new
89	89	cd ../build-new
90	90
91		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
92		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	91	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	92	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
93	93	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
94	94	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
95	95
...	...	@@ -113,5 +113,5 @@ stage3/bin/zig build -p stage4 \
113	113	-Dtarget=native-native-musl \
114	114	-Dno-lib \
115	115	--search-prefix "$PREFIX" \
116		--zig-lib-dir "$(pwd)/../lib"
	116	--zig-lib-dir "$PWD/../lib"
117	117	stage4/bin/zig test ../test/behavior.zig

ci/x86_64-linux-release.sh+6-6

...	...	@@ -37,8 +37,8 @@ cd build-release
37	37	# Override the cache directories because they won't actually help other CI runs
38	38	# which will be testing alternate versions of zig, and ultimately would just
39	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"
	40	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	41	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
42	42
43	43	cmake .. \
44	44	-DCMAKE_INSTALL_PREFIX="stage3-release" \
...	...	@@ -76,7 +76,7 @@ stage3-release/bin/zig build test docs \
76	76	-Dstatic-llvm \
77	77	-Dtarget=native-native-musl \
78	78	--search-prefix "$PREFIX" \
79		--zig-lib-dir "$(pwd)/../lib"
	79	--zig-lib-dir "$PWD/../lib"
80	80
81	81	# Look for HTML errors.
82	82	# TODO: move this to a build.zig flag (-Denable-tidy)
...	...	@@ -105,8 +105,8 @@ rm -rf ../build-new
105	105	mkdir ../build-new
106	106	cd ../build-new
107	107
108		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
109		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	108	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	109	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
110	110	export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
111	111	export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
112	112
...	...	@@ -130,5 +130,5 @@ stage3/bin/zig build -p stage4 \
130	130	-Dtarget=native-native-musl \
131	131	-Dno-lib \
132	132	--search-prefix "$PREFIX" \
133		--zig-lib-dir "$(pwd)/../lib"
	133	--zig-lib-dir "$PWD/../lib"
134	134	stage4/bin/zig test ../test/behavior.zig

ci/x86_64-macos-release.sh+4-4

...	...	@@ -3,7 +3,7 @@
3	3	set -x
4	4	set -e
5	5
6		ZIGDIR="$(pwd)"
	6	ZIGDIR="$PWD"
7	7	TARGET="$ARCH-macos-none"
8	8	MCPU="baseline"
9	9	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.12.0-dev.467+0345d7866"
...	...	@@ -40,8 +40,8 @@ cd build
40	40	# Override the cache directories because they won't actually help other CI runs
41	41	# which will be testing alternate versions of zig, and ultimately would just
42	42	# fill up space on the hard drive for no reason.
43		export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache"
44		export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache"
	43	export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
	44	export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
45	45
46	46	cmake .. \
47	47	-DCMAKE_PREFIX_PATH="$PREFIX" \
...	...	@@ -56,7 +56,7 @@ cmake .. \
56	56	make $JOBS install
57	57
58	58	stage3/bin/zig build test docs \
59		--zig-lib-dir "$(pwd)/../lib" \
	59	--zig-lib-dir "$PWD/../lib" \
60	60	-Denable-macos-sdk \
61	61	-Dstatic-llvm \
62	62	-Dskip-non-native \

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

...	...	@@ -1,19 +1,10 @@
1	1	$TARGET = "$($Env:ARCH)-windows-gnu"
2	2	$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.12.0-dev.2073+402fe565a"
3	3	$MCPU = "baseline"
4		$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
5		$PREFIX_PATH = "$(Get-Location)\$ZIG_LLVM_CLANG_LLD_NAME"
	4	$PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME"
6	5	$ZIG = "$PREFIX_PATH\bin\zig.exe"
7	6	$ZIG_LIB_DIR = "$(Get-Location)\lib"
8	7
9		choco install ninja
10		Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
11		Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$ZIG_LLVM_CLANG_LLD_NAME.zip"
12
13		Write-Output "Extracting..."
14		Add-Type -AssemblyName System.IO.Compression.FileSystem ;
15		[System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD/$ZIG_LLVM_CLANG_LLD_NAME.zip", "$PWD")
16
17	8	function CheckLastExitCode {
18	9	if (!$?) {
19	10	exit 1
...	...	@@ -43,6 +34,8 @@ Set-Location -Path 'build-debug'
43	34	-DCMAKE_BUILD_TYPE=Debug `
44	35	-DCMAKE_C_COMPILER="$($ZIG -Replace "\\", "/");cc;-target;$TARGET;-mcpu=$MCPU" `
45	36	-DCMAKE_CXX_COMPILER="$($ZIG -Replace "\\", "/");c++;-target;$TARGET;-mcpu=$MCPU" `
	37	-DCMAKE_AR="$($ZIG -Replace "\\", "/")" `
	38	-DZIG_AR_WORKAROUND=ON `
46	39	-DZIG_TARGET_TRIPLE="$TARGET" `
47	40	-DZIG_TARGET_MCPU="$MCPU" `
48	41	-DZIG_STATIC=ON `
...	...	@@ -85,10 +78,10 @@ CheckLastExitCode
85	78	--mod build_options config.zig
86	79	CheckLastExitCode
87	80
88		Import-Module "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
	81	Import-Module "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
89	82	CheckLastExitCode
90	83
91		Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
	84	Enter-VsDevShell -VsInstallPath "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools" `
92	85	-DevCmdArguments '-arch=x64 -no_logo' `
93	86	-StartInPath $(Get-Location)
94	87	CheckLastExitCode

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

...	...	@@ -1,19 +1,10 @@
1	1	$TARGET = "$($Env:ARCH)-windows-gnu"
2	2	$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.12.0-dev.2073+402fe565a"
3	3	$MCPU = "baseline"
4		$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
5		$PREFIX_PATH = "$(Get-Location)\$ZIG_LLVM_CLANG_LLD_NAME"
	4	$PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME"
6	5	$ZIG = "$PREFIX_PATH\bin\zig.exe"
7	6	$ZIG_LIB_DIR = "$(Get-Location)\lib"
8	7
9		choco install ninja
10		Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
11		Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$ZIG_LLVM_CLANG_LLD_NAME.zip"
12
13		Write-Output "Extracting..."
14		Add-Type -AssemblyName System.IO.Compression.FileSystem ;
15		[System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD/$ZIG_LLVM_CLANG_LLD_NAME.zip", "$PWD")
16
17	8	function CheckLastExitCode {
18	9	if (!$?) {
19	10	exit 1
...	...	@@ -43,6 +34,8 @@ Set-Location -Path 'build-release'
43	34	-DCMAKE_BUILD_TYPE=Release `
44	35	-DCMAKE_C_COMPILER="$($ZIG -Replace "\\", "/");cc;-target;$TARGET;-mcpu=$MCPU" `
45	36	-DCMAKE_CXX_COMPILER="$($ZIG -Replace "\\", "/");c++;-target;$TARGET;-mcpu=$MCPU" `
	37	-DCMAKE_AR="$($ZIG -Replace "\\", "/")" `
	38	-DZIG_AR_WORKAROUND=ON `
46	39	-DZIG_TARGET_TRIPLE="$TARGET" `
47	40	-DZIG_TARGET_MCPU="$MCPU" `
48	41	-DZIG_STATIC=ON `
...	...	@@ -84,10 +77,10 @@ CheckLastExitCode
84	77	--mod build_options config.zig
85	78	CheckLastExitCode
86	79
87		Import-Module "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
	80	Import-Module "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
88	81	CheckLastExitCode
89	82
90		Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
	83	Enter-VsDevShell -VsInstallPath "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools" `
91	84	-DevCmdArguments '-arch=x64 -no_logo' `
92	85	-StartInPath $(Get-Location)
93	86	CheckLastExitCode