authorgravatar for bratishkaerik@getgoogleoff.meEric Joldasov <bratishkaerik@getgoogleoff.me> 2022-10-26 11:42:17+06:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-10-27 20:53:11-04:00
log398a3aae40bc03f6b7c6cd86d78a4cde125f2811
tree6ba0378325c8d73a70f2bb8cd5ee90a8a353cfda
parentf2401a07569b375aae77600755fb8e2ca615e93c

CI: make directory structure in releases consistent

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

ci/azure/macos_script+16-2
...@@ -55,12 +55,26 @@ stage3-release/bin/zig build test docs \...@@ -55,12 +55,26 @@ stage3-release/bin/zig build test docs \
55 -Dskip-non-native \55 -Dskip-non-native \
56 --search-prefix "$PREFIX"56 --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
58if [ "${BUILD_REASON}" != "PullRequest" ]; then65if [ "${BUILD_REASON}" != "PullRequest" ]; then
59 mv ../LICENSE stage3-release/66 # Remove the unnecessary bin dir in stage3-release/bin/zig
60 mv ../zig-cache/langref.html stage3-release/
61 mv stage3-release/bin/zig stage3-release/67 mv stage3-release/bin/zig stage3-release/
62 rmdir stage3-release/bin68 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
64 VERSION=$(stage3-release/zig version)78 VERSION=$(stage3-release/zig version)
65 DIRNAME="zig-macos-$ARCH-$VERSION"79 DIRNAME="zig-macos-$ARCH-$VERSION"
66 TARBALL="$DIRNAME.tar.xz"80 TARBALL="$DIRNAME.tar.xz"
ci/azure/pipelines.yml+18-8
...@@ -60,6 +60,7 @@ jobs:...@@ -60,6 +60,7 @@ jobs:
60 displayName: 'Build'60 displayName: 'Build'
6161
62 - pwsh: |62 - pwsh: |
63 Set-Variable -Name ZIGLIBDIR -Value "$(Get-Location)\lib"
63 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"64 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
64 Set-Variable -Name ZIGPREFIXPATH -Value "$(Get-Location)\$(ZIG_LLVM_CLANG_LLD_NAME)"65 Set-Variable -Name ZIGPREFIXPATH -Value "$(Get-Location)\$(ZIG_LLVM_CLANG_LLD_NAME)"
6566
...@@ -75,6 +76,14 @@ jobs:...@@ -75,6 +76,14 @@ jobs:
75 -Dstatic-llvm `76 -Dstatic-llvm `
76 -Dskip-non-native77 -Dskip-non-native
77 CheckLastExitCode78 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 name: test87 name: test
79 displayName: 'Test'88 displayName: 'Test'
8089
...@@ -84,6 +93,7 @@ jobs:...@@ -84,6 +93,7 @@ jobs:
84 secureFile: aws_credentials93 secureFile: aws_credentials
8594
86 - pwsh: |95 - pwsh: |
96 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
87 $Env:AWS_SHARED_CREDENTIALS_FILE = "$Env:DOWNLOADSECUREFILE_SECUREFILEPATH"97 $Env:AWS_SHARED_CREDENTIALS_FILE = "$Env:DOWNLOADSECUREFILE_SECUREFILEPATH"
8898
89 # Workaround Azure networking issue99 # Workaround Azure networking issue
...@@ -91,15 +101,15 @@ jobs:...@@ -91,15 +101,15 @@ jobs:
91 $Env:AWS_EC2_METADATA_DISABLED = "true"101 $Env:AWS_EC2_METADATA_DISABLED = "true"
92 $Env:AWS_REGION = "us-west-2"102 $Env:AWS_REGION = "us-west-2"
93103
94 mv LICENSE stage3-release/104 mv LICENSE "$ZIGINSTALLDIR"
95 mv zig-cache/langref.html stage3-release/105 mv zig-cache/langref.html "$ZIGINSTALLDIR"
96 mv stage3-release/bin/zig.exe stage3-release/106 mv "$ZIGINSTALLDIR\bin\zig.exe" "$ZIGINSTALLDIR\doc\"
97 rmdir stage3-release/bin107 rmdir "$ZIGINSTALLDIR/bin"
98108
99 # Remove the unnecessary zig dir in $prefix/lib/zig/std/std.zig109 # Remove the unnecessary zig dir in $ZIGINSTALLDIR\lib\zig\std\std.zig
100 mv stage3-release/lib/zig stage3-release/lib2110 mv "$ZIGINSTALLDIR\lib\zig" "$ZIGINSTALLDIR\lib2"
101 rmdir stage3-release/lib111 rmdir "$ZIGINSTALLDIR\lib"
102 mv stage3-release/lib2 stage3-release/lib112 mv "$ZIGINSTALLDIR\lib2" "$ZIGINSTALLDIR\lib"
103113
104 Set-Variable -Name VERSION -Value $(./stage3-release/zig.exe version)114 Set-Variable -Name VERSION -Value $(./stage3-release/zig.exe version)
105 Set-Variable -Name DIRNAME -Value "zig-windows-x86_64-$VERSION"115 Set-Variable -Name DIRNAME -Value "zig-windows-x86_64-$VERSION"
ci/drone/linux_script_finalize+10-3
...@@ -14,12 +14,19 @@ fi...@@ -14,12 +14,19 @@ fi
1414
15cd build15cd build
1616
17mv ../LICENSE "$INSTALL_PREFIX/"17# Remove the unnecessary bin dir in $INSTALL_PREFIX/bin/zig
18# https://github.com/ziglang/zig/issues/12689
19# mv ../zig-cache/langref.html "$INSTALL_PREFIX/"
20mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/"18mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/"
21rmdir "$INSTALL_PREFIX/bin"19rmdir "$INSTALL_PREFIX/bin"
2220
21# Remove the unnecessary zig dir in $INSTALL_PREFIX/lib/zig/std/std.zig
22mv "$INSTALL_PREFIX/lib/zig" "$INSTALL_PREFIX/lib2"
23rmdir "$INSTALL_PREFIX/lib"
24mv "$INSTALL_PREFIX/lib2" "$INSTALL_PREFIX/lib"
25
26mv ../LICENSE "$INSTALL_PREFIX/"
27# https://github.com/ziglang/zig/issues/12689
28# mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/"
29
23GITBRANCH="$DRONE_BRANCH"30GITBRANCH="$DRONE_BRANCH"
24VERSION="$("$INSTALL_PREFIX/zig" version)"31VERSION="$("$INSTALL_PREFIX/zig" version)"
25DIRNAME="zig-linux-$ARCH-$VERSION"32DIRNAME="zig-linux-$ARCH-$VERSION"
ci/drone/test_linux_std_Debug+7
...@@ -13,3 +13,10 @@ $ZIG build test-std \...@@ -13,3 +13,10 @@ $ZIG build test-std \
13 -Dskip-release-fast \13 -Dskip-release-fast \
14 -Dskip-release-small \14 -Dskip-release-small \
15 -Dskip-non-native15 -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 \...@@ -62,12 +62,26 @@ stage3/bin/zig build test docs \
62 -Dskip-stage1 \62 -Dskip-stage1 \
63 -Dskip-non-native63 -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
65if [ -f ~/.s3cfg ]; then72if [ -f ~/.s3cfg ]; then
66 mv ../LICENSE stage3/73 # Remove the unnecessary bin dir in stage3/bin/zig
67 mv ../zig-cache/langref.html stage3/
68 mv stage3/bin/zig stage3/74 mv stage3/bin/zig stage3/
69 rmdir stage3/bin75 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
71 GITBRANCH=$(basename $GITHUB_REF)85 GITBRANCH=$(basename $GITHUB_REF)
72 VERSION=$(stage3/zig version)86 VERSION=$(stage3/zig version)
73 DIRNAME="zig-freebsd-x86_64-$VERSION"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,7 +48,7 @@ wget "https://ziglang.org/builds/$NATIVE_TARBALL"
48tar xf "$NATIVE_TARBALL"48tar xf "$NATIVE_TARBALL"
49ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)"49ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)"
50ZIG="$ZIGDIR/zig"50ZIG="$ZIGDIR/zig"
51LANGREF="$ZIGDIR/docs/langref.html"51LANGREF="$ZIGDIR/doc/langref.html"
52SRCTARBALLDIR="zig-$VERSION"52SRCTARBALLDIR="zig-$VERSION"
53export SRC_TARBALL="$SRCTARBALLDIR.tar.xz"53export SRC_TARBALL="$SRCTARBALLDIR.tar.xz"
54mv "$SRCDIR" "$SRCTARBALLDIR"54mv "$SRCDIR" "$SRCTARBALLDIR"
...@@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \...@@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \
120120
121$S3CMD put -P --no-mime-magic \121$S3CMD put -P --no-mime-magic \
122 --add-header="Cache-Control: max-age=0, must-revalidate" \122 --add-header="Cache-Control: max-age=0, must-revalidate" \
123 "$ZIGDIR/docs/std/index.html" s3://ziglang.org/documentation/master/std/index.html123 "$ZIGDIR/doc/std/index.html" s3://ziglang.org/documentation/master/std/index.html
124124
125$S3CMD put -P --no-mime-magic \125$S3CMD put -P --no-mime-magic \
126 --add-header="Cache-Control: max-age=0, must-revalidate" \126 --add-header="Cache-Control: max-age=0, must-revalidate" \
127 "$ZIGDIR/docs/std/main.js" s3://ziglang.org/documentation/master/std/main.js127 "$ZIGDIR/doc/std/main.js" s3://ziglang.org/documentation/master/std/main.js
128128
129$S3CMD put -P --no-mime-magic \129$S3CMD put -P --no-mime-magic \
130 --add-header="Cache-Control: max-age=0, must-revalidate" \130 --add-header="Cache-Control: max-age=0, must-revalidate" \
131 "$ZIGDIR/docs/std/data.js" s3://ziglang.org/documentation/master/std/data.js131 "$ZIGDIR/doc/std/data.js" s3://ziglang.org/documentation/master/std/data.js
132132
133$S3CMD put -P --no-mime-magic --recursive \133$S3CMD put -P --no-mime-magic --recursive \
134 --add-header="Cache-Control: max-age=0, must-revalidate" \134 --add-header="Cache-Control: max-age=0, must-revalidate" \
135 -m "text/html" \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/
137137
138$S3CMD put -P --no-mime-magic \138$S3CMD put -P --no-mime-magic \
139 --add-header="cache-control: public, max-age=31536000, immutable" \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,17 +44,17 @@ ninja install
44 --zig-lib-dir "$(pwd)/../lib"44 --zig-lib-dir "$(pwd)/../lib"
4545
46# Produce the experimental std lib documentation.46# Produce the experimental std lib documentation.
47mkdir -p "$RELEASE_STAGING/docs/std"47mkdir -p "$RELEASE_STAGING/doc/std"
48"$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \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 -fno-emit-bin \50 -fno-emit-bin \
51 --zig-lib-dir "$(pwd)/../lib"51 --zig-lib-dir "$(pwd)/../lib"
5252
53cp ../LICENSE $RELEASE_STAGING/53cp ../LICENSE $RELEASE_STAGING/
54cp ../zig-cache/langref.html $RELEASE_STAGING/docs/54cp ../zig-cache/langref.html $RELEASE_STAGING/doc/
5555
56# Look for HTML errors.56# Look for HTML errors.
57tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html57tidy --drop-empty-elements no -qe $RELEASE_STAGING/doc/langref.html
5858
59# Explicit exit helps show last command duration.59# Explicit exit helps show last command duration.
60exit60exit
ci/zinc/macos_package+1-1
...@@ -24,7 +24,7 @@ mv $INSTALL_PREFIX/lib/zig $INSTALL_PREFIX/lib2...@@ -24,7 +24,7 @@ mv $INSTALL_PREFIX/lib/zig $INSTALL_PREFIX/lib2
24rmdir $INSTALL_PREFIX/lib24rmdir $INSTALL_PREFIX/lib
25mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib25mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib
2626
27cp -r "$ZIG_PREFIX/docs" "$INSTALL_PREFIX/"27cp -r "$ZIG_PREFIX/doc" "$INSTALL_PREFIX/"
28cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/"28cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/"
2929
30mv "$INSTALL_PREFIX" "$BASENAME"30mv "$INSTALL_PREFIX" "$BASENAME"