diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 45228b8daa..0e00d84570 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,55 +1,29 @@
-name: push_ci
-run-name: Push CI
-on:
-  push:
-    branches:
-      - master
+name: ci
+on: [push, pull_request]
 jobs:
-  aarch64-linux:
-    runs-on: [self-hosted, Linux, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Build and Test
-        run: sh ./ci/linux/build-aarch64.sh
   x86_64-linux-debug:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, x86_64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Build and Test
         run: sh ./ci/linux/build-x86_64-debug.sh
   x86_64-linux-release:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, x86_64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Build and Test
         run: sh ./ci/linux/build-x86_64-release.sh
   x86_64-macos:
-    strategy:
-      matrix:
-        version: ["11", "12"]
-    runs-on: "macos-${{ matrix.version }}"
+    runs-on: "macos-11"
     env: 
       ARCH: "x86_64"
-      MACOS_VERSION: ${{ matrix.version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      
-      - name: Run Build Script
+      - name: Build and Test
         run: ./ci/macos/build-x86_64.sh
-  aarch64-macos:
-    runs-on: [self-hosted, macOS, aarch64]
-    env: 
-      ARCH: "aarch64"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      
-      - name: Run Build Script
-        run: ./ci/macos/build-aarch64.sh
   x86_64-windows:
     runs-on: windows-latest
     env: 
@@ -57,14 +31,45 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      
-      - name: Run Build Script
+      - name: Build and Test
         run: ./ci/windows/build.ps1
-  build-tarballs:
-    needs: [aarch64-linux, x86_64-macos, aarch64-macos, x86_64-windows, x86_64-linux-debug, x86_64-linux-release]
+  aarch64-linux:
     runs-on: [self-hosted, Linux, aarch64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Build and Test
+        run: sh ./ci/linux/build-aarch64.sh
+  aarch64-macos:
+    runs-on: [self-hosted, macOS, aarch64]
+    env: 
+      ARCH: "aarch64"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build and Test
+        run: ./ci/macos/build-aarch64.sh
+  build-tarballs:
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}  
+    runs-on: ubuntu-latest
+    needs: 
+      - x86_64-linux-debug
+      - x86_64-linux-release
+      - x86_64-macos
+      - x86_64-windows
+      - aarch64-linux
+      - aarch64-macos
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3            
+      - uses: webfactory/ssh-agent@v0.6.0
+        with:
+          ssh-private-key: ${{ secrets.WEBSITE_CI_PUSH_SSH_KEY }}
+      - name: Set AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1      
       - name: Build Tarballs
         run: sh ./ci/linux/build-tarballs.sh
diff --git a/ci/linux/build-tarballs.sh b/ci/linux/build-tarballs.sh
index a1b601fe15..4a0d6670fc 100644
--- a/ci/linux/build-tarballs.sh
+++ b/ci/linux/build-tarballs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Requires cmake ninja-build
+apt-get install ninja-build
 
 set -x
 set -e
@@ -13,9 +13,13 @@ ARCH="$(uname -m)"
 TARGET="$ARCH-linux-musl"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.11.0-dev.256+271cc52a1"
-PREFIX="$HOME/deps/$CACHE_BASENAME"
+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"
@@ -26,7 +30,6 @@ git fetch --tags
 export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
 export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
 
-rm -rf "$REL_SRC_BUILD"
 mkdir "$REL_SRC_BUILD"
 cd "$REL_SRC_BUILD"
 cmake .. \
@@ -46,30 +49,30 @@ unset CXX
 ninja install
 
 ZIG_VERSION="$(stage3-release/bin/zig version)"
+
+git clone https://github.com/ziglang/zig-bootstrap
 BOOTSTRAP_SRC="$WORKDIR/zig-bootstrap"
 TARBALLS_DIR="$WORKDIR/tarballs"
 
 cd "$BOOTSTRAP_SRC"
-git pull
 rm -rf zig
 cp -r "$ZIGDIR" ./
 sed -i "/^ZIG_VERSION=\".*\"\$/c\\ZIG_VERSION=\"$ZIG_VERSION\"" build
 
-# Unfortunately Debian's cmake (3.14.4) is too old for zig-bootstrap.
-PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build aarch64-linux-musl baseline
-PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build x86_64-linux-musl baseline
-#PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build x86-linux-musl baseline
-#PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build riscv64-linux-musl baseline
-#PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build arm-linux-musleabihf generic+v7a
-PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build x86_64-macos-none baseline
-PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build aarch64-macos-none apple_a14
-PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build x86_64-windows-gnu baseline
-#PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build x86-windows-gnu baseline
-#PATH="$HOME/local/bin:$PATH" CMAKE_GENERATOR=Ninja ./build aarch64-windows-gnu baseline
+# NOTE: Debian's cmake (3.14.4) is too old for zig-bootstrap.
+CMAKE_GENERATOR=Ninja ./build x86_64-linux-musl baseline
+CMAKE_GENERATOR=Ninja ./build x86_64-macos-none baseline
+CMAKE_GENERATOR=Ninja ./build x86_64-windows-gnu baseline
+CMAKE_GENERATOR=Ninja ./build aarch64-linux-musl baseline
+CMAKE_GENERATOR=Ninja ./build aarch64-macos-none apple_a14
+# CMAKE_GENERATOR=Ninja ./build aarch64-windows-gnu baseline
+# CMAKE_GENERATOR=Ninja ./build x86-linux-musl baseline
+# CMAKE_GENERATOR=Ninja ./build x86-windows-gnu baseline
+# CMAKE_GENERATOR=Ninja ./build arm-linux-musleabihf generic+v7a
+# CMAKE_GENERATOR=Ninja ./build riscv64-linux-musl baseline
 
 ZIG="$BOOTSTRAP_SRC/out/host/bin/zig"
 
-rm -rf "$TARBALLS_DIR"
 mkdir "$TARBALLS_DIR"
 cd "$TARBALLS_DIR"
 
@@ -92,158 +95,159 @@ tar cfJ "zig-$ZIG_VERSION.tar.xz" "zig-$ZIG_VERSION"
 cd "$BOOTSTRAP_SRC"
 "$ZIG" build --build-file zig/build.zig docs
 LANGREF_HTML="$BOOTSTRAP_SRC/zig/zig-cache/langref.html"
+
 # Look for HTML errors.
 tidy --drop-empty-elements no -qe "$LANGREF_HTML"
 
 cd "$TARBALLS_DIR"
 
-cp -r $BOOTSTRAP_SRC/out/zig-aarch64-linux-musl-baseline zig-linux-aarch64-$ZIG_VERSION/
-cp -r $BOOTSTRAP_SRC/out/zig-aarch64-macos-none-apple_a14 zig-macos-aarch64-$ZIG_VERSION/
-#cp -r $BOOTSTRAP_SRC/out/zig-aarch64-windows-gnu-baseline zig-windows-aarch64-$ZIG_VERSION/
-#cp -r $BOOTSTRAP_SRC/out/zig-arm-linux-musleabihf-generic+v7a zig-linux-armv7a-$ZIG_VERSION/
-#cp -r $BOOTSTRAP_SRC/out/zig-x86-linux-musl-baseline zig-linux-x86-$ZIG_VERSION/
-#cp -r $BOOTSTRAP_SRC/out/zig-x86-windows-gnu-baseline zig-windows-x86-$ZIG_VERSION/
-#cp -r $BOOTSTRAP_SRC/out/zig-riscv64-linux-musl-baseline zig-linux-riscv64-$ZIG_VERSION/
-#cp -r $BOOTSTRAP_SRC/out/zig-x86_64-freebsd-gnu-baseline zig-freebsd-x86_64-$ZIG_VERSION/
 cp -r $BOOTSTRAP_SRC/out/zig-x86_64-linux-musl-baseline zig-linux-x86_64-$ZIG_VERSION/
 cp -r $BOOTSTRAP_SRC/out/zig-x86_64-macos-none-baseline zig-macos-x86_64-$ZIG_VERSION/
 cp -r $BOOTSTRAP_SRC/out/zig-x86_64-windows-gnu-baseline zig-windows-x86_64-$ZIG_VERSION/
+#cp -r $BOOTSTRAP_SRC/out/zig-x86_64-freebsd-gnu-baseline zig-freebsd-x86_64-$ZIG_VERSION/
+cp -r $BOOTSTRAP_SRC/out/zig-aarch64-linux-musl-baseline zig-linux-aarch64-$ZIG_VERSION/
+cp -r $BOOTSTRAP_SRC/out/zig-aarch64-macos-none-apple_a14 zig-macos-aarch64-$ZIG_VERSION/
+#cp -r $BOOTSTRAP_SRC/out/zig-aarch64-windows-gnu-baseline zig-windows-aarch64-$ZIG_VERSION/
+#cp -r $BOOTSTRAP_SRC/out/zig-x86-linux-musl-baseline zig-linux-x86-$ZIG_VERSION/
+#cp -r $BOOTSTRAP_SRC/out/zig-x86-windows-gnu-baseline zig-windows-x86-$ZIG_VERSION/
+#cp -r $BOOTSTRAP_SRC/out/zig-arm-linux-musleabihf-generic+v7a zig-linux-armv7a-$ZIG_VERSION/
+#cp -r $BOOTSTRAP_SRC/out/zig-riscv64-linux-musl-baseline zig-linux-riscv64-$ZIG_VERSION/
 
-mv zig-linux-aarch64-$ZIG_VERSION/{bin/,}zig
-#mv zig-linux-armv7a-$ZIG_VERSION/{bin/,}zig
-#mv zig-linux-x86-$ZIG_VERSION/{bin/,}zig
-#mv zig-linux-riscv64-$ZIG_VERSION/{bin/,}zig
 mv zig-linux-x86_64-$ZIG_VERSION/{bin/,}zig
-#mv zig-windows-x86-$ZIG_VERSION/{bin/,}zig.exe
-mv zig-windows-x86_64-$ZIG_VERSION/{bin/,}zig.exe
-#mv zig-windows-aarch64-$ZIG_VERSION/{bin/,}zig.exe
-mv zig-macos-aarch64-$ZIG_VERSION/{bin/,}zig
 mv zig-macos-x86_64-$ZIG_VERSION/{bin/,}zig
+mv zig-windows-x86_64-$ZIG_VERSION/{bin/,}zig.exe
 #mv zig-freebsd-x86_64-$ZIG_VERSION/{bin/,}zig
+mv zig-linux-aarch64-$ZIG_VERSION/{bin/,}zig
+mv zig-macos-aarch64-$ZIG_VERSION/{bin/,}zig
+#mv zig-windows-aarch64-$ZIG_VERSION/{bin/,}zig.exe
+#mv zig-linux-x86-$ZIG_VERSION/{bin/,}zig
+#mv zig-windows-x86-$ZIG_VERSION/{bin/,}zig.exe
+#mv zig-linux-armv7a-$ZIG_VERSION/{bin/,}zig
+#mv zig-linux-riscv64-$ZIG_VERSION/{bin/,}zig
 
-mv zig-linux-aarch64-$ZIG_VERSION/{lib,lib2}
-#mv zig-linux-armv7a-$ZIG_VERSION/{lib,lib2}
-#mv zig-linux-x86-$ZIG_VERSION/{lib,lib2}
-#mv zig-linux-riscv64-$ZIG_VERSION/{lib,lib2}
 mv zig-linux-x86_64-$ZIG_VERSION/{lib,lib2}
-#mv zig-windows-x86-$ZIG_VERSION/{lib,lib2}
-mv zig-windows-x86_64-$ZIG_VERSION/{lib,lib2}
-#mv zig-windows-aarch64-$ZIG_VERSION/{lib,lib2}
-mv zig-macos-aarch64-$ZIG_VERSION/{lib,lib2}
 mv zig-macos-x86_64-$ZIG_VERSION/{lib,lib2}
+mv zig-windows-x86_64-$ZIG_VERSION/{lib,lib2}
 #mv zig-freebsd-x86_64-$ZIG_VERSION/{lib,lib2}
+mv zig-linux-aarch64-$ZIG_VERSION/{lib,lib2}
+mv zig-macos-aarch64-$ZIG_VERSION/{lib,lib2}
+#mv zig-windows-aarch64-$ZIG_VERSION/{lib,lib2}
+#mv zig-linux-x86-$ZIG_VERSION/{lib,lib2}
+#mv zig-windows-x86-$ZIG_VERSION/{lib,lib2}
+#mv zig-linux-armv7a-$ZIG_VERSION/{lib,lib2}
+#mv zig-linux-riscv64-$ZIG_VERSION/{lib,lib2}
 
-mv zig-linux-aarch64-$ZIG_VERSION/{lib2/zig,lib}
-#mv zig-linux-armv7a-$ZIG_VERSION/{lib2/zig,lib}
-#mv zig-linux-x86-$ZIG_VERSION/{lib2/zig,lib}
-#mv zig-linux-riscv64-$ZIG_VERSION/{lib2/zig,lib}
 mv zig-linux-x86_64-$ZIG_VERSION/{lib2/zig,lib}
-#mv zig-windows-x86-$ZIG_VERSION/{lib2/zig,lib}
-mv zig-windows-x86_64-$ZIG_VERSION/{lib2/zig,lib}
-#mv zig-windows-aarch64-$ZIG_VERSION/{lib2/zig,lib}
-mv zig-macos-aarch64-$ZIG_VERSION/{lib2/zig,lib}
 mv zig-macos-x86_64-$ZIG_VERSION/{lib2/zig,lib}
+mv zig-windows-x86_64-$ZIG_VERSION/{lib2/zig,lib}
 #mv zig-freebsd-x86_64-$ZIG_VERSION/{lib2/zig,lib}
+mv zig-linux-aarch64-$ZIG_VERSION/{lib2/zig,lib}
+mv zig-macos-aarch64-$ZIG_VERSION/{lib2/zig,lib}
+#mv zig-windows-aarch64-$ZIG_VERSION/{lib2/zig,lib}
+#mv zig-linux-x86-$ZIG_VERSION/{lib2/zig,lib}
+#mv zig-windows-x86-$ZIG_VERSION/{lib2/zig,lib}
+#mv zig-linux-armv7a-$ZIG_VERSION/{lib2/zig,lib}
+#mv zig-linux-riscv64-$ZIG_VERSION/{lib2/zig,lib}
 
-rmdir zig-linux-aarch64-$ZIG_VERSION/{bin,lib2}
-#rmdir zig-linux-armv7a-$ZIG_VERSION/{bin,lib2}
-#rmdir zig-linux-x86-$ZIG_VERSION/{bin,lib2}
-#rmdir zig-linux-riscv64-$ZIG_VERSION/{bin,lib2}
 rmdir zig-linux-x86_64-$ZIG_VERSION/{bin,lib2}
-#rmdir zig-windows-x86-$ZIG_VERSION/{bin,lib2}
-rmdir zig-windows-x86_64-$ZIG_VERSION/{bin,lib2}
-#rmdir zig-windows-aarch64-$ZIG_VERSION/{bin,lib2}
-rmdir zig-macos-aarch64-$ZIG_VERSION/{bin,lib2}
 rmdir zig-macos-x86_64-$ZIG_VERSION/{bin,lib2}
+rmdir zig-windows-x86_64-$ZIG_VERSION/{bin,lib2}
 #rmdir zig-freebsd-x86_64-$ZIG_VERSION/{bin,lib2}
+rmdir zig-linux-aarch64-$ZIG_VERSION/{bin,lib2}
+rmdir zig-macos-aarch64-$ZIG_VERSION/{bin,lib2}
+#rmdir zig-windows-aarch64-$ZIG_VERSION/{bin,lib2}
+#rmdir zig-linux-x86-$ZIG_VERSION/{bin,lib2}
+#rmdir zig-windows-x86-$ZIG_VERSION/{bin,lib2}
+#rmdir zig-linux-armv7a-$ZIG_VERSION/{bin,lib2}
+#rmdir zig-linux-riscv64-$ZIG_VERSION/{bin,lib2}
 
-cp $REL_SRC_BUILD/../LICENSE zig-linux-aarch64-$ZIG_VERSION/
-#cp $REL_SRC_BUILD/../LICENSE zig-linux-armv7a-$ZIG_VERSION/
-#cp $REL_SRC_BUILD/../LICENSE zig-linux-x86-$ZIG_VERSION/
-#cp $REL_SRC_BUILD/../LICENSE zig-linux-riscv64-$ZIG_VERSION/
 cp $REL_SRC_BUILD/../LICENSE zig-linux-x86_64-$ZIG_VERSION/
-#cp $REL_SRC_BUILD/../LICENSE zig-windows-x86-$ZIG_VERSION/
-cp $REL_SRC_BUILD/../LICENSE zig-windows-x86_64-$ZIG_VERSION/
-#cp $REL_SRC_BUILD/../LICENSE zig-windows-aarch64-$ZIG_VERSION/
-cp $REL_SRC_BUILD/../LICENSE zig-macos-aarch64-$ZIG_VERSION/
 cp $REL_SRC_BUILD/../LICENSE zig-macos-x86_64-$ZIG_VERSION/
+cp $REL_SRC_BUILD/../LICENSE zig-windows-x86_64-$ZIG_VERSION/
 #cp $REL_SRC_BUILD/../LICENSE zig-freebsd-x86_64-$ZIG_VERSION/
+cp $REL_SRC_BUILD/../LICENSE zig-linux-aarch64-$ZIG_VERSION/
+cp $REL_SRC_BUILD/../LICENSE zig-macos-aarch64-$ZIG_VERSION/
+#cp $REL_SRC_BUILD/../LICENSE zig-windows-aarch64-$ZIG_VERSION/
+#cp $REL_SRC_BUILD/../LICENSE zig-linux-x86-$ZIG_VERSION/
+#cp $REL_SRC_BUILD/../LICENSE zig-windows-x86-$ZIG_VERSION/
+#cp $REL_SRC_BUILD/../LICENSE zig-linux-armv7a-$ZIG_VERSION/
+#cp $REL_SRC_BUILD/../LICENSE zig-linux-riscv64-$ZIG_VERSION/
 
-mkdir zig-linux-aarch64-$ZIG_VERSION/doc/
-#mkdir zig-linux-armv7a-$ZIG_VERSION/doc/
-#mkdir zig-linux-x86-$ZIG_VERSION/doc/
-#mkdir zig-linux-riscv64-$ZIG_VERSION/doc/
 mkdir zig-linux-x86_64-$ZIG_VERSION/doc/
-#mkdir zig-windows-x86-$ZIG_VERSION/doc/
-mkdir zig-windows-x86_64-$ZIG_VERSION/doc/
-#mkdir zig-windows-aarch64-$ZIG_VERSION/doc/
-mkdir zig-macos-aarch64-$ZIG_VERSION/doc/
 mkdir zig-macos-x86_64-$ZIG_VERSION/doc/
+mkdir zig-windows-x86_64-$ZIG_VERSION/doc/
 #mkdir zig-freebsd-x86_64-$ZIG_VERSION/doc/
+mkdir zig-linux-aarch64-$ZIG_VERSION/doc/
+mkdir zig-macos-aarch64-$ZIG_VERSION/doc/
+#mkdir zig-windows-aarch64-$ZIG_VERSION/doc/
+#mkdir zig-linux-x86-$ZIG_VERSION/doc/
+#mkdir zig-windows-x86-$ZIG_VERSION/doc/
+#mkdir zig-linux-armv7a-$ZIG_VERSION/doc/
+#mkdir zig-linux-riscv64-$ZIG_VERSION/doc/
 
 cd $REL_SRC_BUILD
-stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-aarch64 -target aarch64-linux-musl -fno-emit-bin --zig-lib-dir ../lib
-#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-armv7a -target arm-linux-musl -mcpu=generic+v7a -fno-emit-bin --zig-lib-dir ../lib
-#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-x86 -target x86-linux-musl -fno-emit-bin --zig-lib-dir ../lib
-#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-riscv64 -target riscv64-linux-musl -fno-emit-bin --zig-lib-dir ../lib
 stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-x86_64 -target x86_64-linux-musl -fno-emit-bin --zig-lib-dir ../lib
-#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-windows-x86 -target x86-windows-gnu -fno-emit-bin --zig-lib-dir ../lib
 stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-windows-x86_64 -target x86_64-windows-gnu -fno-emit-bin --zig-lib-dir ../lib
-#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-windows-aarch64 -target aarch64-windows-gnu -fno-emit-bin --zig-lib-dir ../lib
 stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-macos-x86_64 -target x86_64-macos -fno-emit-bin --zig-lib-dir ../lib
-stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-macos-aarch64 -target aarch64-macos -fno-emit-bin --zig-lib-dir ../lib
 #stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-freebsd-x86_64 -target x86_64-freebsd -fno-emit-bin --zig-lib-dir ../lib
+stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-aarch64 -target aarch64-linux-musl -fno-emit-bin --zig-lib-dir ../lib
+stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-macos-aarch64 -target aarch64-macos -fno-emit-bin --zig-lib-dir ../lib
+#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-windows-aarch64 -target aarch64-windows-gnu -fno-emit-bin --zig-lib-dir ../lib
+#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-x86 -target x86-linux-musl -fno-emit-bin --zig-lib-dir ../lib
+#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-windows-x86 -target x86-windows-gnu -fno-emit-bin --zig-lib-dir ../lib
+#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-armv7a -target arm-linux-musl -mcpu=generic+v7a -fno-emit-bin --zig-lib-dir ../lib
+#stage3-release/bin/zig test ../lib/std/std.zig -femit-docs=doc-linux-riscv64 -target riscv64-linux-musl -fno-emit-bin --zig-lib-dir ../lib
 
 cd "$TARBALLS_DIR"
-cp -r $REL_SRC_BUILD/doc-linux-aarch64 zig-linux-aarch64-$ZIG_VERSION/doc/std
-#cp -r $REL_SRC_BUILD/doc-linux-armv7a zig-linux-armv7a-$ZIG_VERSION/doc/std
-#cp -r $REL_SRC_BUILD/doc-linux-x86 zig-linux-x86-$ZIG_VERSION/doc/std
-#cp -r $REL_SRC_BUILD/doc-linux-riscv64 zig-linux-riscv64-$ZIG_VERSION/doc/std
 cp -r $REL_SRC_BUILD/doc-linux-x86_64 zig-linux-x86_64-$ZIG_VERSION/doc/std
-#cp -r $REL_SRC_BUILD/doc-windows-x86 zig-windows-x86-$ZIG_VERSION/doc/std
-cp -r $REL_SRC_BUILD/doc-windows-x86_64 zig-windows-x86_64-$ZIG_VERSION/doc/std
-#cp -r $REL_SRC_BUILD/doc-windows-aarch64 zig-windows-aarch64-$ZIG_VERSION/doc/std
-cp -r $REL_SRC_BUILD/doc-macos-aarch64 zig-macos-aarch64-$ZIG_VERSION/doc/std
 cp -r $REL_SRC_BUILD/doc-macos-x86_64 zig-macos-x86_64-$ZIG_VERSION/doc/std
+cp -r $REL_SRC_BUILD/doc-windows-x86_64 zig-windows-x86_64-$ZIG_VERSION/doc/std
 #cp -r $REL_SRC_BUILD/doc-freebsd-x86_64 zig-freebsd-x86_64-$ZIG_VERSION/doc/std
+cp -r $REL_SRC_BUILD/doc-linux-aarch64 zig-linux-aarch64-$ZIG_VERSION/doc/std
+cp -r $REL_SRC_BUILD/doc-macos-aarch64 zig-macos-aarch64-$ZIG_VERSION/doc/std
+#cp -r $REL_SRC_BUILD/doc-windows-aarch64 zig-windows-aarch64-$ZIG_VERSION/doc/std
+#cp -r $REL_SRC_BUILD/doc-linux-x86 zig-linux-x86-$ZIG_VERSION/doc/std
+#cp -r $REL_SRC_BUILD/doc-windows-x86 zig-windows-x86-$ZIG_VERSION/doc/std
+#cp -r $REL_SRC_BUILD/doc-linux-armv7a zig-linux-armv7a-$ZIG_VERSION/doc/std
+#cp -r $REL_SRC_BUILD/doc-linux-riscv64 zig-linux-riscv64-$ZIG_VERSION/doc/std
 
-cp $LANGREF_HTML zig-linux-aarch64-$ZIG_VERSION/doc/
-#cp $LANGREF_HTML zig-linux-armv7a-$ZIG_VERSION/doc/
-#cp $LANGREF_HTML zig-linux-x86-$ZIG_VERSION/doc/
-#cp $LANGREF_HTML zig-linux-riscv64-$ZIG_VERSION/doc/
 cp $LANGREF_HTML zig-linux-x86_64-$ZIG_VERSION/doc/
-#cp $LANGREF_HTML zig-windows-x86-$ZIG_VERSION/doc/
-cp $LANGREF_HTML zig-windows-x86_64-$ZIG_VERSION/doc/
-#cp $LANGREF_HTML zig-windows-aarch64-$ZIG_VERSION/doc/
-cp $LANGREF_HTML zig-macos-aarch64-$ZIG_VERSION/doc/
 cp $LANGREF_HTML zig-macos-x86_64-$ZIG_VERSION/doc/
+cp $LANGREF_HTML zig-windows-x86_64-$ZIG_VERSION/doc/
 #cp $LANGREF_HTML zig-freebsd-x86_64-$ZIG_VERSION/doc/
+cp $LANGREF_HTML zig-linux-aarch64-$ZIG_VERSION/doc/
+cp $LANGREF_HTML zig-macos-aarch64-$ZIG_VERSION/doc/
+#cp $LANGREF_HTML zig-windows-aarch64-$ZIG_VERSION/doc/
+#cp $LANGREF_HTML zig-linux-x86-$ZIG_VERSION/doc/
+#cp $LANGREF_HTML zig-windows-x86-$ZIG_VERSION/doc/
+#cp $LANGREF_HTML zig-linux-armv7a-$ZIG_VERSION/doc/
+#cp $LANGREF_HTML zig-linux-riscv64-$ZIG_VERSION/doc/
 
-tar cJf zig-linux-aarch64-$ZIG_VERSION.tar.xz zig-linux-aarch64-$ZIG_VERSION/
-#tar cJf zig-linux-armv7a-$ZIG_VERSION.tar.xz zig-linux-armv7a-$ZIG_VERSION/
-#tar cJf zig-linux-x86-$ZIG_VERSION.tar.xz zig-linux-x86-$ZIG_VERSION/
-#tar cJf zig-linux-riscv64-$ZIG_VERSION.tar.xz zig-linux-riscv64-$ZIG_VERSION/
 tar cJf zig-linux-x86_64-$ZIG_VERSION.tar.xz zig-linux-x86_64-$ZIG_VERSION/
-#7z a zig-windows-x86-$ZIG_VERSION.zip zig-windows-x86-$ZIG_VERSION/
-7z a zig-windows-x86_64-$ZIG_VERSION.zip zig-windows-x86_64-$ZIG_VERSION/
-#7z a zig-windows-aarch64-$ZIG_VERSION.zip zig-windows-aarch64-$ZIG_VERSION/
-tar cJf zig-macos-aarch64-$ZIG_VERSION.tar.xz zig-macos-aarch64-$ZIG_VERSION/
 tar cJf zig-macos-x86_64-$ZIG_VERSION.tar.xz zig-macos-x86_64-$ZIG_VERSION/
+7z a zig-windows-x86_64-$ZIG_VERSION.zip zig-windows-x86_64-$ZIG_VERSION/
 #tar cJf zig-freebsd-x86_64-$ZIG_VERSION.tar.xz zig-freebsd-x86_64-$ZIG_VERSION/
+tar cJf zig-linux-aarch64-$ZIG_VERSION.tar.xz zig-linux-aarch64-$ZIG_VERSION/
+tar cJf zig-macos-aarch64-$ZIG_VERSION.tar.xz zig-macos-aarch64-$ZIG_VERSION/
+#7z a zig-windows-aarch64-$ZIG_VERSION.zip zig-windows-aarch64-$ZIG_VERSION/
+#tar cJf zig-linux-x86-$ZIG_VERSION.tar.xz zig-linux-x86-$ZIG_VERSION/
+#7z a zig-windows-x86-$ZIG_VERSION.zip zig-windows-x86-$ZIG_VERSION/
+#tar cJf zig-linux-armv7a-$ZIG_VERSION.tar.xz zig-linux-armv7a-$ZIG_VERSION/
+#tar cJf zig-linux-riscv64-$ZIG_VERSION.tar.xz zig-linux-riscv64-$ZIG_VERSION/
 
 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
 #s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-bootstrap-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
-s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-aarch64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
-#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-armv7a-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
-#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-x86-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
-#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-riscv64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-x86_64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
-#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-windows-x86-$ZIG_VERSION.zip s3://ziglang.org/builds/$ZIG_VERSION/
-s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-windows-x86_64-$ZIG_VERSION.zip s3://ziglang.org/builds/$ZIG_VERSION/
-#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-windows-aarch64-$ZIG_VERSION.zip s3://ziglang.org/builds/$ZIG_VERSION/
-s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-macos-aarch64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-macos-x86_64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
 #s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-freebsd-x86_64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
+s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-windows-x86_64-$ZIG_VERSION.zip s3://ziglang.org/builds/$ZIG_VERSION/
+s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-aarch64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
+s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-macos-aarch64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
+#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-windows-aarch64-$ZIG_VERSION.zip s3://ziglang.org/builds/$ZIG_VERSION/
+#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-x86-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
+#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-windows-x86-$ZIG_VERSION.zip s3://ziglang.org/builds/$ZIG_VERSION/
+#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-armv7a-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
+#s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-linux-riscv64-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/$ZIG_VERSION/
 
 export SRC_TARBALL="zig-$ZIG_VERSION.tar.xz"
 export SRC_SHASUM=$(sha256sum "zig-$ZIG_VERSION.tar.xz" | cut '-d ' -f1)
@@ -285,11 +289,13 @@ cd "$ZIGDIR/ci"
 "$ZIG" run update-download-page.zig
 mv out "$TARBALLS_DIR/out"
 
-cd "$WORKDIR/www.ziglang.org"
+cd "$WORKDIR"
+git clone --depth=1 git@github.com:ziglang/www.ziglang.org.git
+cd www.ziglang.org
+
 # This is the user when pushing to the website repo.
 git config user.email "ziggy@ziglang.org"
 git config user.name "Ziggy"
-git pull
 
 cp "$TARBALLS_DIR/out/index.json" data/releases.json
 git add data/releases.json
diff --git a/ci/macos/build-aarch64.sh b/ci/macos/build-aarch64.sh
index d8087963bc..e8fe795b42 100755
--- a/ci/macos/build-aarch64.sh
+++ b/ci/macos/build-aarch64.sh
@@ -3,8 +3,6 @@
 set -x
 set -e
 
-echo "Running on Version:" $MACOS_VERSION
-
 # Script assumes the presence of the following:
 # s3cmd 
 
diff --git a/ci/macos/build-x86_64.sh b/ci/macos/build-x86_64.sh
index 31fb02f610..ea19abce45 100755
--- a/ci/macos/build-x86_64.sh
+++ b/ci/macos/build-x86_64.sh
@@ -3,8 +3,6 @@
 set -x
 set -e
 
-echo "Running on Version:" $MACOS_VERSION
-
 # Script assumes the presence of the following:
 # s3cmd 
 
@@ -13,7 +11,7 @@ TARGET="$ARCH-macos-none"
 MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.4560+828735ac0"
 PREFIX="$HOME/$CACHE_BASENAME"
-JOBS="-j2"
+JOBS="-j3"
 
 rm -rf $PREFIX
 cd $HOME