Commit 398a3aae40bc03f6b7c6cd86d78a4cde125f2811 | zig

author	Eric Joldasov <bratishkaerik@getgoogleoff.me> 2022-10-26 11:42:17+06:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-10-27 20:53:11-04:00
log	398a3aae40bc03f6b7c6cd86d78a4cde125f2811
tree	6ba0378325c8d73a70f2bb8cd5ee90a8a353cfda
parent	f2401a07569b375aae77600755fb8e2ca615e93c

CI: make directory structure in releases consistent

8 files changed, 77 insertions(+), 25 deletions(-)

ci
- azure
  - macos_script
  - pipelines.yml
- drone
  - linux_script_finalize
  - test_linux_std_Debug
- srht
  - freebsd_script
  - update_download_page
- zinc
  - linux_test_stage3_release
  - macos_package

ci/azure/macos_script+16-2

...	...	@@ -55,12 +55,26 @@ stage3-release/bin/zig build test docs \
55	55	-Dskip-non-native \
56	56	--search-prefix "$PREFIX"
57	57
	58	# Produce the experimental std lib documentation.
	59	mkdir -p "stage3-release/doc/std"
	60	stage3-release/bin/zig test "$(pwd)/../lib/std/std.zig" \
	61	--zig-lib-dir "$(pwd)/../lib" \
	62	-femit-docs="$(pwd)/stage3-release/doc/std" \
	63	-fno-emit-bin
	64
58	65	if [ "${BUILD_REASON}" != "PullRequest" ]; then
59		mv ../LICENSE stage3-release/
60		mv ../zig-cache/langref.html stage3-release/
	66	# Remove the unnecessary bin dir in stage3-release/bin/zig
61	67	mv stage3-release/bin/zig stage3-release/
62	68	rmdir stage3-release/bin
63	69
	70	# Remove the unnecessary zig dir in stage3-release/lib/zig/std/std.zig
	71	mv stage3-release/lib/zig stage3-release/lib2
	72	rmdir stage3-release/lib
	73	mv stage3-release/lib2 stage3-release/lib
	74
	75	mv ../LICENSE stage3-release/
	76	mv ../zig-cache/langref.html stage3-release/doc
	77
64	78	VERSION=$(stage3-release/zig version)
65	79	DIRNAME="zig-macos-$ARCH-$VERSION"
66	80	TARBALL="$DIRNAME.tar.xz"

ci/azure/pipelines.yml+18-8

...	...	@@ -60,6 +60,7 @@ jobs:
60	60	displayName: 'Build'
61	61
62	62	- pwsh: \|
	63	Set-Variable -Name ZIGLIBDIR -Value "$(Get-Location)\lib"
63	64	Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
64	65	Set-Variable -Name ZIGPREFIXPATH -Value "$(Get-Location)\$(ZIG_LLVM_CLANG_LLD_NAME)"
65	66
...	...	@@ -75,6 +76,14 @@ jobs:
75	76	-Dstatic-llvm `
76	77	-Dskip-non-native
77	78	CheckLastExitCode
	79
	80	# Produce the experimental std lib documentation.
	81	mkdir "$ZIGINSTALLDIR\doc\std" -force
	82	& "$ZIGINSTALLDIR\bin\zig.exe" test "$ZIGLIBDIR\std\std.zig" `
	83	--zig-lib-dir "$ZIGLIBDIR" `
	84	-femit-docs="$ZIGINSTALLDIR\doc\std" `
	85	-fno-emit-bin
	86
78	87	name: test
79	88	displayName: 'Test'
80	89
...	...	@@ -84,6 +93,7 @@ jobs:
84	93	secureFile: aws_credentials
85	94
86	95	- pwsh: \|
	96	Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
87	97	$Env:AWS_SHARED_CREDENTIALS_FILE = "$Env:DOWNLOADSECUREFILE_SECUREFILEPATH"
88	98
89	99	# Workaround Azure networking issue
...	...	@@ -91,15 +101,15 @@ jobs:
91	101	$Env:AWS_EC2_METADATA_DISABLED = "true"
92	102	$Env:AWS_REGION = "us-west-2"
93	103
94		mv LICENSE stage3-release/
95		mv zig-cache/langref.html stage3-release/
96		mv stage3-release/bin/zig.exe stage3-release/
97		rmdir stage3-release/bin
	104	mv LICENSE "$ZIGINSTALLDIR"
	105	mv zig-cache/langref.html "$ZIGINSTALLDIR"
	106	mv "$ZIGINSTALLDIR\bin\zig.exe" "$ZIGINSTALLDIR\doc\"
	107	rmdir "$ZIGINSTALLDIR/bin"
98	108
99		# Remove the unnecessary zig dir in $prefix/lib/zig/std/std.zig
100		mv stage3-release/lib/zig stage3-release/lib2
101		rmdir stage3-release/lib
102		mv stage3-release/lib2 stage3-release/lib
	109	# Remove the unnecessary zig dir in $ZIGINSTALLDIR\lib\zig\std\std.zig
	110	mv "$ZIGINSTALLDIR\lib\zig" "$ZIGINSTALLDIR\lib2"
	111	rmdir "$ZIGINSTALLDIR\lib"
	112	mv "$ZIGINSTALLDIR\lib2" "$ZIGINSTALLDIR\lib"
103	113
104	114	Set-Variable -Name VERSION -Value $(./stage3-release/zig.exe version)
105	115	Set-Variable -Name DIRNAME -Value "zig-windows-x86_64-$VERSION"

ci/drone/linux_script_finalize+10-3

...	...	@@ -14,12 +14,19 @@ fi
14	14
15	15	cd build
16	16
17		mv ../LICENSE "$INSTALL_PREFIX/"
18		# https://github.com/ziglang/zig/issues/12689
19		# mv ../zig-cache/langref.html "$INSTALL_PREFIX/"
	17	# Remove the unnecessary bin dir in $INSTALL_PREFIX/bin/zig
20	18	mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/"
21	19	rmdir "$INSTALL_PREFIX/bin"
22	20
	21	# Remove the unnecessary zig dir in $INSTALL_PREFIX/lib/zig/std/std.zig
	22	mv "$INSTALL_PREFIX/lib/zig" "$INSTALL_PREFIX/lib2"
	23	rmdir "$INSTALL_PREFIX/lib"
	24	mv "$INSTALL_PREFIX/lib2" "$INSTALL_PREFIX/lib"
	25
	26	mv ../LICENSE "$INSTALL_PREFIX/"
	27	# https://github.com/ziglang/zig/issues/12689
	28	# mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/"
	29
23	30	GITBRANCH="$DRONE_BRANCH"
24	31	VERSION="$("$INSTALL_PREFIX/zig" version)"
25	32	DIRNAME="zig-linux-$ARCH-$VERSION"

ci/drone/test_linux_std_Debug+7

...	...	@@ -13,3 +13,10 @@ $ZIG build test-std \
13	13	-Dskip-release-fast \
14	14	-Dskip-release-small \
15	15	-Dskip-non-native
	16
	17	# Produce the experimental std lib documentation.
	18	mkdir -p "$INSTALL_PREFIX/doc/std"
	19	$ZIG test "$DRONE_WORKSPACE/lib/std/std.zig" \
	20	--zig-lib-dir "$DRONE_WORKSPACE/lib" \
	21	-femit-docs="$INSTALL_PREFIX/doc/std" \
	22	-fno-emit-bin

ci/srht/freebsd_script+16-2

...	...	@@ -62,12 +62,26 @@ stage3/bin/zig build test docs \
62	62	-Dskip-stage1 \
63	63	-Dskip-non-native
64	64
	65	# Produce the experimental std lib documentation.
	66	mkdir -p "stage3/doc/std"
	67	stage3/bin/zig test "$(pwd)/../lib/std/std.zig" \
	68	--zig-lib-dir "$(pwd)/../lib" \
	69	-femit-docs="$(pwd)/stage3/doc/std/" \
	70	-fno-emit-bin
	71
65	72	if [ -f ~/.s3cfg ]; then
66		mv ../LICENSE stage3/
67		mv ../zig-cache/langref.html stage3/
	73	# Remove the unnecessary bin dir in stage3/bin/zig
68	74	mv stage3/bin/zig stage3/
69	75	rmdir stage3/bin
70	76
	77	# Remove the unnecessary zig dir in stage3/lib/zig/std/std.zig
	78	mv stage3/lib/zig stage3/lib2
	79	rmdir stage3/lib
	80	mv stage3/lib2 stage3/lib
	81
	82	mv ../LICENSE stage3/
	83	mv ../zig-cache/langref.html stage3/doc/
	84
71	85	GITBRANCH=$(basename $GITHUB_REF)
72	86	VERSION=$(stage3/zig version)
73	87	DIRNAME="zig-freebsd-x86_64-$VERSION"

ci/srht/update_download_page+5-5

...	...	@@ -48,7 +48,7 @@ wget "https://ziglang.org/builds/$NATIVE_TARBALL"
48	48	tar xf "$NATIVE_TARBALL"
49	49	ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)"
50	50	ZIG="$ZIGDIR/zig"
51		LANGREF="$ZIGDIR/docs/langref.html"
	51	LANGREF="$ZIGDIR/doc/langref.html"
52	52	SRCTARBALLDIR="zig-$VERSION"
53	53	export SRC_TARBALL="$SRCTARBALLDIR.tar.xz"
54	54	mv "$SRCDIR" "$SRCTARBALLDIR"
...	...	@@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \
120	120
121	121	$S3CMD put -P --no-mime-magic \
122	122	--add-header="Cache-Control: max-age=0, must-revalidate" \
123		"$ZIGDIR/docs/std/index.html" s3://ziglang.org/documentation/master/std/index.html
	123	"$ZIGDIR/doc/std/index.html" s3://ziglang.org/documentation/master/std/index.html
124	124
125	125	$S3CMD put -P --no-mime-magic \
126	126	--add-header="Cache-Control: max-age=0, must-revalidate" \
127		"$ZIGDIR/docs/std/main.js" s3://ziglang.org/documentation/master/std/main.js
	127	"$ZIGDIR/doc/std/main.js" s3://ziglang.org/documentation/master/std/main.js
128	128
129	129	$S3CMD put -P --no-mime-magic \
130	130	--add-header="Cache-Control: max-age=0, must-revalidate" \
131		"$ZIGDIR/docs/std/data.js" s3://ziglang.org/documentation/master/std/data.js
	131	"$ZIGDIR/doc/std/data.js" s3://ziglang.org/documentation/master/std/data.js
132	132
133	133	$S3CMD put -P --no-mime-magic --recursive \
134	134	--add-header="Cache-Control: max-age=0, must-revalidate" \
135	135	-m "text/html" \
136		"$ZIGDIR/docs/std/src/" s3://ziglang.org/documentation/master/std/src/
	136	"$ZIGDIR/doc/std/src/" s3://ziglang.org/documentation/master/std/src/
137	137
138	138	$S3CMD put -P --no-mime-magic \
139	139	--add-header="cache-control: public, max-age=31536000, immutable" \

ci/zinc/linux_test_stage3_release+4-4

...	...	@@ -44,17 +44,17 @@ ninja install
44	44	--zig-lib-dir "$(pwd)/../lib"
45	45
46	46	# Produce the experimental std lib documentation.
47		mkdir -p "$RELEASE_STAGING/docs/std"
	47	mkdir -p "$RELEASE_STAGING/doc/std"
48	48	"$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \
49		-femit-docs=$RELEASE_STAGING/docs/std \
	49	-femit-docs=$RELEASE_STAGING/doc/std \
50	50	-fno-emit-bin \
51	51	--zig-lib-dir "$(pwd)/../lib"
52	52
53	53	cp ../LICENSE $RELEASE_STAGING/
54		cp ../zig-cache/langref.html $RELEASE_STAGING/docs/
	54	cp ../zig-cache/langref.html $RELEASE_STAGING/doc/
55	55
56	56	# Look for HTML errors.
57		tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html
	57	tidy --drop-empty-elements no -qe $RELEASE_STAGING/doc/langref.html
58	58
59	59	# Explicit exit helps show last command duration.
60	60	exit

ci/zinc/macos_package+1-1

...	...	@@ -24,7 +24,7 @@ mv $INSTALL_PREFIX/lib/zig $INSTALL_PREFIX/lib2
24	24	rmdir $INSTALL_PREFIX/lib
25	25	mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib
26	26
27		cp -r "$ZIG_PREFIX/docs" "$INSTALL_PREFIX/"
	27	cp -r "$ZIG_PREFIX/doc" "$INSTALL_PREFIX/"
28	28	cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/"
29	29
30	30	mv "$INSTALL_PREFIX" "$BASENAME"