| author |  Andrew Kelley <andrew@ziglang.org> 2022-10-21 13:18:37-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2022-10-21 13:18:37-07:00 |
| log | 3b2f0c3eeefa188e57cb1ee0874306f1d3734031 |
| tree | 94f414162f102a4620c94b0b49eee6be0acfaa34 |
| parent | 28054d96f0ed5280660811612732cb000f9c09e8 |
Revert "ci: make directory structure in releases consistent"
This reverts commit 28054d96f0ed5280660811612732cb000f9c09e8.
This caused CI failures.8 files changed, 18 insertions(+), 67 deletions(-)
ci/azure/macos_script+2-16
| ... | @@ -55,26 +55,12 @@ stage3-release/bin/zig build test docs \ | ... | @@ -55,26 +55,12 @@ stage3-release/bin/zig build test docs \ |
| 55 | -Dskip-non-native \ | 55 | -Dskip-non-native \ |
| 56 | --search-prefix "$PREFIX" | 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 | |||
| 65 | if [ "${BUILD_REASON}" != "PullRequest" ]; then | 58 | if [ "${BUILD_REASON}" != "PullRequest" ]; then |
| 66 | # Remove the unnecessary bin dir in stage3-release/bin/zig | 59 | mv ../LICENSE stage3-release/ |
| 60 | mv ../zig-cache/langref.html stage3-release/ | ||
| 67 | mv stage3-release/bin/zig stage3-release/ | 61 | mv stage3-release/bin/zig stage3-release/ |
| 68 | rmdir stage3-release/bin | 62 | rmdir stage3-release/bin |
| 69 | 63 | ||
| 70 | # Remove the unnecessary zig dir in stage3-release/lib/zig/std/std.zig | ||
| 71 | mv release/lib/zig release/lib2 | ||
| 72 | rmdir release/lib | ||
| 73 | mv release/lib2 release/lib | ||
| 74 | |||
| 75 | mv ../LICENSE stage3-release/ | ||
| 76 | mv ../zig-cache/langref.html stage3-release/doc | ||
| 77 | |||
| 78 | VERSION=$(stage3-release/zig version) | 64 | VERSION=$(stage3-release/zig version) |
| 79 | DIRNAME="zig-macos-$ARCH-$VERSION" | 65 | DIRNAME="zig-macos-$ARCH-$VERSION" |
| 80 | TARBALL="$DIRNAME.tar.xz" | 66 | TARBALL="$DIRNAME.tar.xz" |
ci/azure/pipelines.yml+1-8
| ... | @@ -91,16 +91,9 @@ jobs: | ... | @@ -91,16 +91,9 @@ jobs: |
| 91 | $Env:AWS_EC2_METADATA_DISABLED = "true" | 91 | $Env:AWS_EC2_METADATA_DISABLED = "true" |
| 92 | $Env:AWS_REGION = "us-west-2" | 92 | $Env:AWS_REGION = "us-west-2" |
| 93 | 93 | ||
| 94 | # Produce the experimental std lib documentation. | ||
| 95 | mkdir stage3-release/doc/std -force | ||
| 96 | "$ZIGINSTALLDIR\bin\zig.exe" test ../lib/std/std.zig \ | ||
| 97 | --zig-lib-dir ../lib \ | ||
| 98 | -femit-docs=stage3-release/doc/std \ | ||
| 99 | -fno-emit-bin | ||
| 100 | |||
| 101 | mv LICENSE stage3-release/ | 94 | mv LICENSE stage3-release/ |
| 102 | mv zig-cache/langref.html stage3-release/ | 95 | mv zig-cache/langref.html stage3-release/ |
| 103 | mv stage3-release/bin/zig.exe stage3-release/doc/ | 96 | mv stage3-release/bin/zig.exe stage3-release/ |
| 104 | rmdir stage3-release/bin | 97 | rmdir stage3-release/bin |
| 105 | 98 | ||
| 106 | # Remove the unnecessary zig dir in $prefix/lib/zig/std/std.zig | 99 | # Remove the unnecessary zig dir in $prefix/lib/zig/std/std.zig |
ci/drone/linux_script_finalize+3-10
| ... | @@ -18,18 +18,11 @@ pip3 install s3cmd | ... | @@ -18,18 +18,11 @@ pip3 install s3cmd |
| 18 | 18 | ||
| 19 | cd build | 19 | cd build |
| 20 | 20 | ||
| 21 | # Remove the unnecessary bin dir in $INSTALL_PREFIX/bin/zig | ||
| 22 | mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/" | ||
| 23 | rmdir "$INSTALL_PREFIX/bin" | ||
| 24 | |||
| 25 | # Remove the unnecessary zig dir in $INSTALL_PREFIX/lib/zig/std/std.zig | ||
| 26 | mv "$INSTALL_PREFIX/lib/zig" "$INSTALL_PREFIX/lib2" | ||
| 27 | rmdir "$INSTALL_PREFIX/lib" | ||
| 28 | mv "$INSTALL_PREFIX/lib2" "$INSTALL_PREFIX/lib" | ||
| 29 | |||
| 30 | mv ../LICENSE "$INSTALL_PREFIX/" | 21 | mv ../LICENSE "$INSTALL_PREFIX/" |
| 31 | # https://github.com/ziglang/zig/issues/12689 | 22 | # https://github.com/ziglang/zig/issues/12689 |
| 32 | # mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/" | 23 | # mv ../zig-cache/langref.html "$INSTALL_PREFIX/" |
| 24 | mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/" | ||
| 25 | rmdir "$INSTALL_PREFIX/bin" | ||
| 33 | 26 | ||
| 34 | GITBRANCH="$DRONE_BRANCH" | 27 | GITBRANCH="$DRONE_BRANCH" |
| 35 | VERSION="$("$INSTALL_PREFIX/zig" version)" | 28 | VERSION="$("$INSTALL_PREFIX/zig" version)" |
ci/drone/test_linux_std_Debug-7
| ... | @@ -13,10 +13,3 @@ $ZIG build test-std \ | ... | @@ -13,10 +13,3 @@ $ZIG build test-std \ |
| 13 | -Dskip-release-fast \ | 13 | -Dskip-release-fast \ |
| 14 | -Dskip-release-small \ | 14 | -Dskip-release-small \ |
| 15 | -Dskip-non-native | 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+2-16
| ... | @@ -62,26 +62,12 @@ stage3/bin/zig build test docs \ | ... | @@ -62,26 +62,12 @@ stage3/bin/zig build test docs \ |
| 62 | -Dskip-stage1 \ | 62 | -Dskip-stage1 \ |
| 63 | -Dskip-non-native | 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 | |||
| 72 | if [ -f ~/.s3cfg ]; then | 65 | if [ -f ~/.s3cfg ]; then |
| 73 | # Remove the unnecessary bin dir in stage3/bin/zig | 66 | mv ../LICENSE stage3/ |
| 67 | mv ../zig-cache/langref.html stage3/ | ||
| 74 | mv stage3/bin/zig stage3/ | 68 | mv stage3/bin/zig stage3/ |
| 75 | rmdir stage3/bin | 69 | rmdir stage3/bin |
| 76 | 70 | ||
| 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 | |||
| 85 | GITBRANCH=$(basename $GITHUB_REF) | 71 | GITBRANCH=$(basename $GITHUB_REF) |
| 86 | VERSION=$(stage3/zig version) | 72 | VERSION=$(stage3/zig version) |
| 87 | DIRNAME="zig-freebsd-x86_64-$VERSION" | 73 | 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" |
| 48 | tar xf "$NATIVE_TARBALL" | 48 | tar xf "$NATIVE_TARBALL" |
| 49 | ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)" | 49 | ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)" |
| 50 | ZIG="$ZIGDIR/zig" | 50 | ZIG="$ZIGDIR/zig" |
| 51 | LANGREF="$ZIGDIR/doc/langref.html" | 51 | LANGREF="$ZIGDIR/docs/langref.html" |
| 52 | SRCTARBALLDIR="zig-$VERSION" | 52 | SRCTARBALLDIR="zig-$VERSION" |
| 53 | export SRC_TARBALL="$SRCTARBALLDIR.tar.xz" | 53 | export SRC_TARBALL="$SRCTARBALLDIR.tar.xz" |
| 54 | mv "$SRCDIR" "$SRCTARBALLDIR" | 54 | mv "$SRCDIR" "$SRCTARBALLDIR" |
| ... | @@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \ | ... | @@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \ |
| 120 | 120 | ||
| 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/doc/std/index.html" s3://ziglang.org/documentation/master/std/index.html | 123 | "$ZIGDIR/docs/std/index.html" s3://ziglang.org/documentation/master/std/index.html |
| 124 | 124 | ||
| 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/doc/std/main.js" s3://ziglang.org/documentation/master/std/main.js | 127 | "$ZIGDIR/docs/std/main.js" s3://ziglang.org/documentation/master/std/main.js |
| 128 | 128 | ||
| 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/doc/std/data.js" s3://ziglang.org/documentation/master/std/data.js | 131 | "$ZIGDIR/docs/std/data.js" s3://ziglang.org/documentation/master/std/data.js |
| 132 | 132 | ||
| 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/doc/std/src/" s3://ziglang.org/documentation/master/std/src/ | 136 | "$ZIGDIR/docs/std/src/" s3://ziglang.org/documentation/master/std/src/ |
| 137 | 137 | ||
| 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" |
| 45 | 45 | ||
| 46 | # Produce the experimental std lib documentation. | 46 | # Produce the experimental std lib documentation. |
| 47 | mkdir -p "$RELEASE_STAGING/doc/std" | 47 | mkdir -p "$RELEASE_STAGING/docs/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/doc/std \ | 49 | -femit-docs=$RELEASE_STAGING/docs/std \ |
| 50 | -fno-emit-bin \ | 50 | -fno-emit-bin \ |
| 51 | --zig-lib-dir "$(pwd)/../lib" | 51 | --zig-lib-dir "$(pwd)/../lib" |
| 52 | 52 | ||
| 53 | cp ../LICENSE $RELEASE_STAGING/ | 53 | cp ../LICENSE $RELEASE_STAGING/ |
| 54 | cp ../zig-cache/langref.html $RELEASE_STAGING/doc/ | 54 | cp ../zig-cache/langref.html $RELEASE_STAGING/docs/ |
| 55 | 55 | ||
| 56 | # Look for HTML errors. | 56 | # Look for HTML errors. |
| 57 | tidy --drop-empty-elements no -qe $RELEASE_STAGING/doc/langref.html | 57 | tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html |
| 58 | 58 | ||
| 59 | # Explicit exit helps show last command duration. | 59 | # Explicit exit helps show last command duration. |
| 60 | exit | 60 | exit |
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 |
| 24 | rmdir $INSTALL_PREFIX/lib | 24 | rmdir $INSTALL_PREFIX/lib |
| 25 | mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib | 25 | mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib |
| 26 | 26 | ||
| 27 | cp -r "$ZIG_PREFIX/doc" "$INSTALL_PREFIX/" | 27 | cp -r "$ZIG_PREFIX/docs" "$INSTALL_PREFIX/" |
| 28 | cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/" | 28 | cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/" |
| 29 | 29 | ||
| 30 | mv "$INSTALL_PREFIX" "$BASENAME" | 30 | mv "$INSTALL_PREFIX" "$BASENAME" |