authorgravatar for bratishkaerik@getgoogleoff.meEric Joldasov <bratishkaerik@getgoogleoff.me> 2022-10-22 06:44:23+06:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-10-22 16:43:35-07:00
log54c8861bc4b6aa08a2252943c93317d91ef0bfa6
tree82e8bc250f3141caba5f0925a350d9864036622d
parente67c756b9114debdaa566188f677f60e507dfac8

fix CI failures with commit "ci: make directory structure in releases consistent"

8 files changed, 75 insertions(+), 26 deletions(-)

ci/azure/macos_script+16-2
......@@ -55,12 +55,26 @@ stage3-release/bin/zig build test docs \
5555 -Dskip-non-native \
5656 --search-prefix "$PREFIX"
5757
58# Produce the experimental std lib documentation.
59mkdir -p "stage3-release/doc/std"
60stage3-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
5865if [ "${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
6167 mv stage3-release/bin/zig stage3-release/
6268 rmdir stage3-release/bin
6369
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
6478 VERSION=$(stage3-release/zig version)
6579 DIRNAME="zig-macos-$ARCH-$VERSION"
6680 TARBALL="$DIRNAME.tar.xz"
ci/azure/pipelines.yml+16-9
......@@ -91,15 +91,22 @@ jobs:
9191 $Env:AWS_EC2_METADATA_DISABLED = "true"
9292 $Env:AWS_REGION = "us-west-2"
9393
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
98
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
94 # Produce the experimental std lib documentation.
95 mkdir "$ZIGINSTALLDIR\doc\std" -force
96 & "$ZIGINSTALLDIR\bin\zig.exe" test "$ZIGLIBDIR\std\std.zig" `
97 --zig-lib-dir "$ZIGLIBDIR" `
98 -femit-docs="$ZIGINSTALLDIR\doc\std" `
99 -fno-emit-bin
100
101 mv LICENSE "$ZIGINSTALLDIR"
102 mv zig-cache/langref.html "$ZIGINSTALLDIR"
103 mv "$ZIGINSTALLDIR\bin\zig.exe" "$ZIGINSTALLDIR\doc\"
104 rmdir "$ZIGINSTALLDIR/bin"
105
106 # Remove the unnecessary zig dir in $ZIGINSTALLDIR\lib\zig\std\std.zig
107 mv "$ZIGINSTALLDIR\lib\zig" "$ZIGINSTALLDIR\lib2"
108 rmdir "$ZIGINSTALLDIR\lib"
109 mv "$ZIGINSTALLDIR\lib2" "$ZIGINSTALLDIR\lib"
103110
104111 Set-Variable -Name VERSION -Value $(./stage3-release/zig.exe version)
105112 Set-Variable -Name DIRNAME -Value "zig-windows-x86_64-$VERSION"
ci/drone/linux_script_finalize+10-3
......@@ -18,12 +18,19 @@ pip3 install s3cmd
1818
1919cd build
2020
21mv ../LICENSE "$INSTALL_PREFIX/"
22# https://github.com/ziglang/zig/issues/12689
23# mv ../zig-cache/langref.html "$INSTALL_PREFIX/"
21# Remove the unnecessary bin dir in $INSTALL_PREFIX/bin/zig
2422mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/"
2523rmdir "$INSTALL_PREFIX/bin"
2624
25# Remove the unnecessary zig dir in $INSTALL_PREFIX/lib/zig/std/std.zig
26mv "$INSTALL_PREFIX/lib/zig" "$INSTALL_PREFIX/lib2"
27rmdir "$INSTALL_PREFIX/lib"
28mv "$INSTALL_PREFIX/lib2" "$INSTALL_PREFIX/lib"
29
30mv ../LICENSE "$INSTALL_PREFIX/"
31# https://github.com/ziglang/zig/issues/12689
32# mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/"
33
2734GITBRANCH="$DRONE_BRANCH"
2835VERSION="$("$INSTALL_PREFIX/zig" version)"
2936DIRNAME="zig-linux-$ARCH-$VERSION"
ci/drone/test_linux_std_Debug+7
......@@ -13,3 +13,10 @@ $ZIG build test-std \
1313 -Dskip-release-fast \
1414 -Dskip-release-small \
1515 -Dskip-non-native
16
17# Produce the experimental std lib documentation.
18mkdir -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 \
6262 -Dskip-stage1 \
6363 -Dskip-non-native
6464
65# Produce the experimental std lib documentation.
66mkdir -p "stage3/doc/std"
67stage3/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
6572if [ -f ~/.s3cfg ]; then
66 mv ../LICENSE stage3/
67 mv ../zig-cache/langref.html stage3/
73 # Remove the unnecessary bin dir in stage3/bin/zig
6874 mv stage3/bin/zig stage3/
6975 rmdir stage3/bin
7076
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
7185 GITBRANCH=$(basename $GITHUB_REF)
7286 VERSION=$(stage3/zig version)
7387 DIRNAME="zig-freebsd-x86_64-$VERSION"
ci/srht/update_download_page+5-5
......@@ -48,7 +48,7 @@ wget "https://ziglang.org/builds/$NATIVE_TARBALL"
4848tar xf "$NATIVE_TARBALL"
4949ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)"
5050ZIG="$ZIGDIR/zig"
51LANGREF="$ZIGDIR/docs/langref.html"
51LANGREF="$ZIGDIR/doc/langref.html"
5252SRCTARBALLDIR="zig-$VERSION"
5353export SRC_TARBALL="$SRCTARBALLDIR.tar.xz"
5454mv "$SRCDIR" "$SRCTARBALLDIR"
......@@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \
120120
121121$S3CMD put -P --no-mime-magic \
122122 --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
124124
125125$S3CMD put -P --no-mime-magic \
126126 --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
128128
129129$S3CMD put -P --no-mime-magic \
130130 --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
132132
133133$S3CMD put -P --no-mime-magic --recursive \
134134 --add-header="Cache-Control: max-age=0, must-revalidate" \
135135 -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/
137137
138138$S3CMD put -P --no-mime-magic \
139139 --add-header="cache-control: public, max-age=31536000, immutable" \
ci/zinc/linux_test_stage3_release+4-4
......@@ -44,17 +44,17 @@ ninja install
4444 --zig-lib-dir "$(pwd)/../lib"
4545
4646# Produce the experimental std lib documentation.
47mkdir -p "$RELEASE_STAGING/docs/std"
47mkdir -p "$RELEASE_STAGING/doc/std"
4848"$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \
49 -femit-docs=$RELEASE_STAGING/docs/std \
49 -femit-docs=$RELEASE_STAGING/doc/std \
5050 -fno-emit-bin \
5151 --zig-lib-dir "$(pwd)/../lib"
5252
5353cp ../LICENSE $RELEASE_STAGING/
54cp ../zig-cache/langref.html $RELEASE_STAGING/docs/
54cp ../zig-cache/langref.html $RELEASE_STAGING/doc/
5555
5656# Look for HTML errors.
57tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html
57tidy --drop-empty-elements no -qe $RELEASE_STAGING/doc/langref.html
5858
5959# Explicit exit helps show last command duration.
6060exit
ci/zinc/macos_package+1-1
......@@ -24,7 +24,7 @@ mv $INSTALL_PREFIX/lib/zig $INSTALL_PREFIX/lib2
2424rmdir $INSTALL_PREFIX/lib
2525mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib
2626
27cp -r "$ZIG_PREFIX/docs" "$INSTALL_PREFIX/"
27cp -r "$ZIG_PREFIX/doc" "$INSTALL_PREFIX/"
2828cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/"
2929
3030mv "$INSTALL_PREFIX" "$BASENAME"