diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-10-22 20:29:24 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-10-22 20:29:24 -0700 |
| commit | f82a82f889bb145fe83eb9cd366f920f10f6dcec (patch) | |
| tree | b28f0638e0115df6adbb1b402687211d5c37c4da /ci/srht | |
| parent | 54c8861bc4b6aa08a2252943c93317d91ef0bfa6 (diff) | |
| download | zig-f82a82f889bb145fe83eb9cd366f920f10f6dcec.tar.gz zig-f82a82f889bb145fe83eb9cd366f920f10f6dcec.zip | |
Revert "fix CI failures with commit "ci: make directory structure in releases consistent""
This reverts commit 54c8861bc4b6aa08a2252943c93317d91ef0bfa6.
This caused CI failure.
Diffstat (limited to 'ci/srht')
| -rwxr-xr-x | ci/srht/freebsd_script | 18 | ||||
| -rwxr-xr-x | ci/srht/update_download_page | 10 |
2 files changed, 7 insertions, 21 deletions
diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script index b70a63f9cb..8cdb10c20c 100755 --- a/ci/srht/freebsd_script +++ b/ci/srht/freebsd_script @@ -62,26 +62,12 @@ stage3/bin/zig build test docs \ -Dskip-stage1 \ -Dskip-non-native -# Produce the experimental std lib documentation. -mkdir -p "stage3/doc/std" -stage3/bin/zig test "$(pwd)/../lib/std/std.zig" \ - --zig-lib-dir "$(pwd)/../lib" \ - -femit-docs="$(pwd)/stage3/doc/std/" \ - -fno-emit-bin - if [ -f ~/.s3cfg ]; then - # Remove the unnecessary bin dir in stage3/bin/zig + mv ../LICENSE stage3/ + mv ../zig-cache/langref.html stage3/ mv stage3/bin/zig stage3/ rmdir stage3/bin - # Remove the unnecessary zig dir in stage3/lib/zig/std/std.zig - mv stage3/lib/zig stage3/lib2 - rmdir stage3/lib - mv stage3/lib2 stage3/lib - - mv ../LICENSE stage3/ - mv ../zig-cache/langref.html stage3/doc/ - GITBRANCH=$(basename $GITHUB_REF) VERSION=$(stage3/zig version) DIRNAME="zig-freebsd-x86_64-$VERSION" diff --git a/ci/srht/update_download_page b/ci/srht/update_download_page index bad6c3c52b..b6ff10bbaa 100755 --- a/ci/srht/update_download_page +++ b/ci/srht/update_download_page @@ -48,7 +48,7 @@ wget "https://ziglang.org/builds/$NATIVE_TARBALL" tar xf "$NATIVE_TARBALL" ZIGDIR="$(pwd)/$(basename $NATIVE_TARBALL .tar.xz)" ZIG="$ZIGDIR/zig" -LANGREF="$ZIGDIR/doc/langref.html" +LANGREF="$ZIGDIR/docs/langref.html" SRCTARBALLDIR="zig-$VERSION" export SRC_TARBALL="$SRCTARBALLDIR.tar.xz" mv "$SRCDIR" "$SRCTARBALLDIR" @@ -120,20 +120,20 @@ $S3CMD put -P --no-mime-magic \ $S3CMD put -P --no-mime-magic \ --add-header="Cache-Control: max-age=0, must-revalidate" \ - "$ZIGDIR/doc/std/index.html" s3://ziglang.org/documentation/master/std/index.html + "$ZIGDIR/docs/std/index.html" s3://ziglang.org/documentation/master/std/index.html $S3CMD put -P --no-mime-magic \ --add-header="Cache-Control: max-age=0, must-revalidate" \ - "$ZIGDIR/doc/std/main.js" s3://ziglang.org/documentation/master/std/main.js + "$ZIGDIR/docs/std/main.js" s3://ziglang.org/documentation/master/std/main.js $S3CMD put -P --no-mime-magic \ --add-header="Cache-Control: max-age=0, must-revalidate" \ - "$ZIGDIR/doc/std/data.js" s3://ziglang.org/documentation/master/std/data.js + "$ZIGDIR/docs/std/data.js" s3://ziglang.org/documentation/master/std/data.js $S3CMD put -P --no-mime-magic --recursive \ --add-header="Cache-Control: max-age=0, must-revalidate" \ -m "text/html" \ - "$ZIGDIR/doc/std/src/" s3://ziglang.org/documentation/master/std/src/ + "$ZIGDIR/docs/std/src/" s3://ziglang.org/documentation/master/std/src/ $S3CMD put -P --no-mime-magic \ --add-header="cache-control: public, max-age=31536000, immutable" \ |