diff options
| -rwxr-xr-x | ci/azure/macos_script | 18 | ||||
| -rw-r--r-- | ci/azure/pipelines.yml | 9 | ||||
| -rwxr-xr-x | ci/drone/linux_script_finalize | 13 | ||||
| -rwxr-xr-x | ci/drone/test_linux_std_Debug | 7 | ||||
| -rwxr-xr-x | ci/srht/freebsd_script | 18 | ||||
| -rwxr-xr-x | ci/srht/update_download_page | 10 | ||||
| -rwxr-xr-x | ci/zinc/linux_test_stage3_release | 8 | ||||
| -rwxr-xr-x | ci/zinc/macos_package | 2 |
8 files changed, 18 insertions, 67 deletions
diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 6b43325ef2..5b3dfbb341 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -55,26 +55,12 @@ stage3-release/bin/zig build test docs \ -Dskip-non-native \ --search-prefix "$PREFIX" -# Produce the experimental std lib documentation. -mkdir -p "stage3-release/doc/std" -stage3-release/bin/zig test "$(pwd)/../lib/std/std.zig" \ - --zig-lib-dir "$(pwd)/../lib" \ - -femit-docs="$(pwd)/stage3-release/doc/std" \ - -fno-emit-bin - if [ "${BUILD_REASON}" != "PullRequest" ]; then - # Remove the unnecessary bin dir in stage3-release/bin/zig + mv ../LICENSE stage3-release/ + mv ../zig-cache/langref.html stage3-release/ mv stage3-release/bin/zig stage3-release/ rmdir stage3-release/bin - # Remove the unnecessary zig dir in stage3-release/lib/zig/std/std.zig - mv release/lib/zig release/lib2 - rmdir release/lib - mv release/lib2 release/lib - - mv ../LICENSE stage3-release/ - mv ../zig-cache/langref.html stage3-release/doc - VERSION=$(stage3-release/zig version) DIRNAME="zig-macos-$ARCH-$VERSION" TARBALL="$DIRNAME.tar.xz" diff --git a/ci/azure/pipelines.yml b/ci/azure/pipelines.yml index 48a0d2254d..e35ea4f328 100644 --- a/ci/azure/pipelines.yml +++ b/ci/azure/pipelines.yml @@ -91,16 +91,9 @@ jobs: $Env:AWS_EC2_METADATA_DISABLED = "true" $Env:AWS_REGION = "us-west-2" - # Produce the experimental std lib documentation. - mkdir stage3-release/doc/std -force - "$ZIGINSTALLDIR\bin\zig.exe" test ../lib/std/std.zig \ - --zig-lib-dir ../lib \ - -femit-docs=stage3-release/doc/std \ - -fno-emit-bin - mv LICENSE stage3-release/ mv zig-cache/langref.html stage3-release/ - mv stage3-release/bin/zig.exe stage3-release/doc/ + mv stage3-release/bin/zig.exe stage3-release/ rmdir stage3-release/bin # Remove the unnecessary zig dir in $prefix/lib/zig/std/std.zig diff --git a/ci/drone/linux_script_finalize b/ci/drone/linux_script_finalize index fce90fecba..43ff5f8f0e 100755 --- a/ci/drone/linux_script_finalize +++ b/ci/drone/linux_script_finalize @@ -18,18 +18,11 @@ pip3 install s3cmd cd build -# Remove the unnecessary bin dir in $INSTALL_PREFIX/bin/zig -mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/" -rmdir "$INSTALL_PREFIX/bin" - -# Remove the unnecessary zig dir in $INSTALL_PREFIX/lib/zig/std/std.zig -mv "$INSTALL_PREFIX/lib/zig" "$INSTALL_PREFIX/lib2" -rmdir "$INSTALL_PREFIX/lib" -mv "$INSTALL_PREFIX/lib2" "$INSTALL_PREFIX/lib" - mv ../LICENSE "$INSTALL_PREFIX/" # https://github.com/ziglang/zig/issues/12689 -# mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/" +# mv ../zig-cache/langref.html "$INSTALL_PREFIX/" +mv "$INSTALL_PREFIX/bin/zig" "$INSTALL_PREFIX/" +rmdir "$INSTALL_PREFIX/bin" GITBRANCH="$DRONE_BRANCH" VERSION="$("$INSTALL_PREFIX/zig" version)" diff --git a/ci/drone/test_linux_std_Debug b/ci/drone/test_linux_std_Debug index bde270fd15..39558e19d1 100755 --- a/ci/drone/test_linux_std_Debug +++ b/ci/drone/test_linux_std_Debug @@ -13,10 +13,3 @@ $ZIG build test-std \ -Dskip-release-fast \ -Dskip-release-small \ -Dskip-non-native - -# Produce the experimental std lib documentation. -mkdir -p "$INSTALL_PREFIX/doc/std" -$ZIG test "$DRONE_WORKSPACE/lib/std/std.zig" \ - --zig-lib-dir "$DRONE_WORKSPACE/lib" \ - -femit-docs="$INSTALL_PREFIX/doc/std" \ - -fno-emit-bin 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" \ diff --git a/ci/zinc/linux_test_stage3_release b/ci/zinc/linux_test_stage3_release index 327c9ab081..63883a3948 100755 --- a/ci/zinc/linux_test_stage3_release +++ b/ci/zinc/linux_test_stage3_release @@ -44,17 +44,17 @@ ninja install --zig-lib-dir "$(pwd)/../lib" # Produce the experimental std lib documentation. -mkdir -p "$RELEASE_STAGING/doc/std" +mkdir -p "$RELEASE_STAGING/docs/std" "$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \ - -femit-docs=$RELEASE_STAGING/doc/std \ + -femit-docs=$RELEASE_STAGING/docs/std \ -fno-emit-bin \ --zig-lib-dir "$(pwd)/../lib" cp ../LICENSE $RELEASE_STAGING/ -cp ../zig-cache/langref.html $RELEASE_STAGING/doc/ +cp ../zig-cache/langref.html $RELEASE_STAGING/docs/ # Look for HTML errors. -tidy --drop-empty-elements no -qe $RELEASE_STAGING/doc/langref.html +tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html # Explicit exit helps show last command duration. exit diff --git a/ci/zinc/macos_package b/ci/zinc/macos_package index 136dbc91fb..6f866d098c 100755 --- a/ci/zinc/macos_package +++ b/ci/zinc/macos_package @@ -24,7 +24,7 @@ mv $INSTALL_PREFIX/lib/zig $INSTALL_PREFIX/lib2 rmdir $INSTALL_PREFIX/lib mv $INSTALL_PREFIX/lib2 $INSTALL_PREFIX/lib -cp -r "$ZIG_PREFIX/doc" "$INSTALL_PREFIX/" +cp -r "$ZIG_PREFIX/docs" "$INSTALL_PREFIX/" cp "$ZIG_PREFIX/LICENSE" "$INSTALL_PREFIX/" mv "$INSTALL_PREFIX" "$BASENAME" |