Commit 60242d6210

@@ -60,11 +60,10 @@ stage3-release/bin/zig build test docs \
   --zig-lib-dir "$(pwd)/../lib"
 
 # Look for HTML errors.
-tidy --drop-empty-elements no -qe zig-cache/langref.html
+tidy --drop-empty-elements no -qe ../zig-cache/langref.html
 
 # Produce the experimental std lib documentation.
-mkdir -p "stage3-release/doc/std"
 stage3-release/bin/zig test ../lib/std/std.zig \
-  -femit-docs=stage3-release/doc/std \
+  -femit-docs \
   -fno-emit-bin \
   --zig-lib-dir "$(pwd)/../lib"

@@ -12,43 +12,6 @@ WORKDIR="$(pwd)"
 ARCH="$(uname -m)"
 TARGET="$ARCH-linux-musl"
 MCPU="baseline"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.11.0-dev.256+271cc52a1"
-PREFIX="$WORKDIR/deps/$CACHE_BASENAME"
-ZIG="$PREFIX/bin/zig" 
-
-OLD_ZIG_VERSION="0.11.0-dev.256+271cc52a1"
-wget "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
-tar xf "$CACHE_BASENAME.tar.xz"
-
-# Make the `zig version` number consistent.
-# This will affect the cmake command below.
-cd "$ZIGDIR"
-git config core.abbrev 9
-git fetch --unshallow || true
-git fetch --tags
-
-export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
-export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
-
-mkdir "$REL_SRC_BUILD"
-cd "$REL_SRC_BUILD"
-cmake .. \
-  -DCMAKE_INSTALL_PREFIX="stage3-release" \
-  -DCMAKE_PREFIX_PATH="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DZIG_TARGET_TRIPLE="$TARGET" \
-  -DZIG_TARGET_MCPU="$MCPU" \
-  -DZIG_STATIC=ON \
-  -GNinja
-
-# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
-# so that installation and testing do not get affected by them.
-unset CC
-unset CXX
-
-ninja install
-
-ZIG_VERSION="$(stage3-release/bin/zig version)"
 
 git clone https://github.com/ziglang/zig-bootstrap
 BOOTSTRAP_SRC="$WORKDIR/zig-bootstrap"

@@ -51,7 +51,9 @@ stage3-debug/bin/zig fmt --check .. \
 # simultaneously test building self-hosted without LLVM and with 32-bit arm
 stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf
 
-stage3-debug/bin/zig build test docs \
+# building docs disabled due to:
+# https://github.com/ziglang/zig/issues/13546
+stage3-debug/bin/zig build test \
   -fqemu \
   -fwasmtime \
   -Dstatic-llvm \
@@ -59,12 +61,13 @@ stage3-debug/bin/zig build test docs \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$(pwd)/../lib"
 
-# Look for HTML errors.
-tidy --drop-empty-elements no -qe zig-cache/langref.html
+# langref disabled due to:
+# https://github.com/ziglang/zig/issues/13546
+## Look for HTML errors.
+#tidy --drop-empty-elements no -qe ../zig-cache/langref.html
 
 # Produce the experimental std lib documentation.
-mkdir -p "stage3-debug/doc/std"
 stage3-debug/bin/zig test ../lib/std/std.zig \
-  -femit-docs=stage3-debug/doc/std \
+  -femit-docs \
   -fno-emit-bin \
   --zig-lib-dir "$(pwd)/../lib"

@@ -60,12 +60,11 @@ stage3-release/bin/zig build test docs \
   --zig-lib-dir "$(pwd)/../lib"
 
 # Look for HTML errors.
-tidy --drop-empty-elements no -qe zig-cache/langref.html
+tidy --drop-empty-elements no -qe ../zig-cache/langref.html
 
 # Produce the experimental std lib documentation.
-mkdir -p "stage3-release/doc/std"
 stage3-release/bin/zig test ../lib/std/std.zig \
-  -femit-docs=stage3-release/doc/std \
+  -femit-docs \
   -fno-emit-bin \
   --zig-lib-dir "$(pwd)/../lib"