Backed out changeset 40f514ec207e (bug 1729406) for causing windows build bustages. CLOSED TREE

2021-09-08 07:43:48 +03:00 · 2021-09-08 07:43:48 +03:00 · e097f3b06f
--- a/build/build-infer/build-infer.py
+++ b/build/build-infer/build-infer.py
@ -31,7 +31,7 @@ def build_tar_package(tar, name, base, directories):
    name = os.path.realpath(name)
    run_in(
        base,
-        [tar, "-c", "-a", "-f", name] + directories,
+        [tar, "-c", "-%s" % ("J" if ".xz" in name else "j"), "-f", name] + directories,
    )


@ -142,7 +142,7 @@ if __name__ == "__main__":
        )
        build_tar_package(
            "tar",
-            "%s.tar.zst" % (package_name),
+            "%s.tar.xz" % (package_name),
            infer_package_with_pref,
            [
                os.path.join("infer", "bin"),
--- a/build/unix/build-binutils/build-binutils.sh
+++ b/build/unix/build-binutils/build-binutils.sh
@ -98,4 +98,4 @@ cd ..

 # Make a package of the built binutils
 cd $root_dir/tools
-tar caf $root_dir/binutils.tar.zst binutils/
+tar caf $root_dir/binutils.tar.xz binutils/
--- a/build/unix/build-gcc/build-gcc.sh
+++ b/build/unix/build-gcc/build-gcc.sh
@ -73,7 +73,7 @@ build_gcc() {
  cd $root_dir/tools
  ln -s gcc gcc/bin/cc

-  tar caf $root_dir/gcc.tar.zst gcc/
+  tar caf $root_dir/gcc.tar.xz gcc/
  popd
 }

@ -118,6 +118,6 @@ build_gcc_and_mingw() {
  popd

  pushd $(dirname $install_dir)
-  tar caf $root_dir/mingw32.tar.zst $(basename $install_dir)/
+  tar caf $root_dir/mingw32.tar.xz $(basename $install_dir)/
  popd
 }
--- a/build/unix/build-hfsplus/build-hfsplus.sh
+++ b/build/unix/build-hfsplus/build-hfsplus.sh
@ -46,4 +46,4 @@ cp $dirname/fsck_hfs.tproj/fsck_hfs hfsplus-tools/fsck_hfs

 # Make a package of the built utils
 cd $root_dir
-tar caf $root_dir/hfsplus-tools.tar.zst hfsplus-tools
+tar caf $root_dir/hfsplus-tools.tar.xz hfsplus-tools
--- a/taskcluster/ci/toolchain/cbindgen.yml
+++ b/taskcluster/ci/toolchain/cbindgen.yml
@ -11,7 +11,7 @@ job-defaults:
        max-run-time: 3600
    run:
        script: build-cbindgen.sh
-        toolchain-artifact: public/build/cbindgen.tar.zst
+        toolchain-artifact: public/build/cbindgen.tar.xz
    run-on-projects: [trunk]
    fetches:
        fetch:
@ -69,6 +69,7 @@ win64-cbindgen:
        arguments: ['x86_64-pc-windows-msvc']
        resources:
            - taskcluster/scripts/misc/tooltool-download.sh
+        toolchain-artifact: public/build/cbindgen.tar.bz2
        tooltool-downloads: internal
    fetches:
        toolchain:
--- a/taskcluster/ci/toolchain/cctools-port.yml
+++ b/taskcluster/ci/toolchain/cctools-port.yml
@ -18,7 +18,7 @@ linux64-cctools-port-clang-11:
        symbol: TL(cctools-clang-11)
    run:
        script: build-cctools-port.sh
-        toolchain-artifact: public/build/cctools.tar.zst
+        toolchain-artifact: public/build/cctools.tar.xz
        tooltool-downloads: internal
    fetches:
        toolchain:
@ -31,7 +31,7 @@ linux64-cctools-port-clang-12:
    run:
        script: build-cctools-port.sh
        toolchain-alias: linux64-cctools-port
-        toolchain-artifact: public/build/cctools.tar.zst
+        toolchain-artifact: public/build/cctools.tar.xz
        tooltool-downloads: internal
    fetches:
        toolchain:
--- a/taskcluster/ci/toolchain/dump-syms.yml
+++ b/taskcluster/ci/toolchain/dump-syms.yml
@ -20,7 +20,7 @@ linux64-dump_syms:
        symbol: TL(dump_syms)
    worker-type: b-linux
    run:
-        toolchain-artifact: public/build/dump_syms.tar.zst
+        toolchain-artifact: public/build/dump_syms.tar.xz
    fetches:
        toolchain:
            - linux64-binutils
@ -34,7 +34,7 @@ macosx64-dump_syms:
    worker-type: b-linux
    run:
        arguments: ['x86_64-apple-darwin']
-        toolchain-artifact: public/build/dump_syms.tar.zst
+        toolchain-artifact: public/build/dump_syms.tar.xz
    fetches:
        toolchain:
            - linux64-rust-macos-1.54
@ -49,7 +49,7 @@ macosx64-aarch64-dump_syms:
    worker-type: b-linux
    run:
        arguments: ['aarch64-apple-darwin']
-        toolchain-artifact: public/build/dump_syms.tar.zst
+        toolchain-artifact: public/build/dump_syms.tar.xz
    fetches:
        toolchain:
            - linux64-rust-macos-1.54
@ -66,7 +66,7 @@ win64-dump_syms:
        env:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
    run:
-        toolchain-artifact: public/build/dump_syms.tar.zst
+        toolchain-artifact: public/build/dump_syms.tar.bz2
        resources:
            - 'taskcluster/scripts/misc/tooltool-download.sh'
        tooltool-downloads: internal
--- a/taskcluster/ci/toolchain/fix-stacks.yml
+++ b/taskcluster/ci/toolchain/fix-stacks.yml
@ -22,7 +22,7 @@ linux64-fix-stacks:
        symbol: TL(fix-stacks)
    run:
        arguments: ['x86_64-unknown-linux-gnu']
-        toolchain-artifact: public/build/fix-stacks.tar.zst
+        toolchain-artifact: public/build/fix-stacks.tar.xz
    fetches:
        toolchain:
            - linux64-binutils
@ -35,7 +35,7 @@ macosx64-fix-stacks:
        symbol: TM(fix-stacks)
    run:
        arguments: ['x86_64-apple-darwin']
-        toolchain-artifact: public/build/fix-stacks.tar.zst
+        toolchain-artifact: public/build/fix-stacks.tar.xz
    fetches:
        toolchain:
            - linux64-cctools-port-clang-11
@ -48,7 +48,7 @@ macosx64-aarch64-fix-stacks:
        symbol: TM(fix-stacks-arm64)
    run:
        arguments: ['aarch64-apple-darwin']
-        toolchain-artifact: public/build/fix-stacks.tar.zst
+        toolchain-artifact: public/build/fix-stacks.tar.xz
    fetches:
        toolchain:
            - linux64-cctools-port-clang-11
@ -64,7 +64,7 @@ win32-fix-stacks:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
    run:
        arguments: ['i686-pc-windows-msvc']
-        toolchain-artifact: public/build/fix-stacks.tar.zst
+        toolchain-artifact: public/build/fix-stacks.tar.bz2
        resources:
            - 'taskcluster/scripts/misc/tooltool-download.sh'
        tooltool-downloads: internal
--- a/taskcluster/ci/toolchain/gcc.yml
+++ b/taskcluster/ci/toolchain/gcc.yml
@ -9,7 +9,7 @@ job-defaults:
    run:
        resources:
            - 'build/unix/build-gcc/build-gcc.sh'
-        toolchain-artifact: public/build/gcc.tar.zst
+        toolchain-artifact: public/build/gcc.tar.xz
    fetches:
        toolchain:
            - linux64-toolchain-sysroot
--- a/taskcluster/ci/toolchain/gn.yml
+++ b/taskcluster/ci/toolchain/gn.yml
@ -12,7 +12,7 @@ job-defaults:
    run:
        resources:
            - 'taskcluster/scripts/misc/build-gn-common.sh'
-        toolchain-artifact: public/build/gn.tar.zst
+        toolchain-artifact: public/build/gn.tar.xz
    fetches:
        fetch:
            - gn
@ -49,6 +49,7 @@ win32-gn:
        script: build-gn-win32.sh
        resources:
            - 'taskcluster/scripts/misc/tooltool-download.sh'
+        toolchain-artifact: public/build/gn.tar.bz2
        tooltool-downloads: internal
    fetches:
        fetch:
--- a/taskcluster/ci/toolchain/grcov.yml
+++ b/taskcluster/ci/toolchain/grcov.yml
@ -9,7 +9,7 @@ job-defaults:
        max-run-time: 1800
    run:
        script: build-grcov.sh
-        toolchain-artifact: public/build/grcov.tar.zst
+        toolchain-artifact: public/build/grcov.tar.xz
    fetches:
        fetch:
            - grcov
@ -42,6 +42,7 @@ win64-grcov:
        env:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
    run:
+        toolchain-artifact: public/build/grcov.tar.bz2
        resources:
            - 'taskcluster/scripts/misc/tooltool-download.sh'
        tooltool-downloads: internal
--- a/taskcluster/ci/toolchain/mingw.yml
+++ b/taskcluster/ci/toolchain/mingw.yml
@ -19,7 +19,7 @@ linux64-mingw32-gcc:
        script: build-gcc-mingw32.sh
        resources:
            - 'build/unix/build-gcc/build-gcc.sh'
-        toolchain-artifact: public/build/mingw32.tar.zst
+        toolchain-artifact: public/build/mingw32.tar.xz
    fetches:
        fetch:
            - binutils-2.27
@ -38,7 +38,7 @@ linux64-mingw32-nsis:
        resources:
            - 'build/unix/build-gcc/build-gcc.sh'
            - 'taskcluster/scripts/misc/build-gcc-mingw32.sh'
-        toolchain-artifact: public/build/nsis.tar.zst
+        toolchain-artifact: public/build/nsis.tar.xz
    fetches:
        fetch:
            - nsis-3.01
@ -55,7 +55,7 @@ linux64-mingw-fxc2-x86:
    run:
        using: toolchain-script
        script: build-mingw-fxc2-x86.sh
-        toolchain-artifact: public/build/fxc2.tar.zst
+        toolchain-artifact: public/build/fxc2.tar.xz
    fetches:
        fetch:
            - fxc2
--- a/taskcluster/ci/toolchain/minidump_stackwalk.yml
+++ b/taskcluster/ci/toolchain/minidump_stackwalk.yml
@ -19,7 +19,7 @@ job-defaults:
            - 'toolkit/crashreporter'
            - 'toolkit/crashreporter/google-breakpad/src/processor'
            - 'tools/crashreporter/'
-        toolchain-artifact: public/build/minidump_stackwalk.tar.zst
+        toolchain-artifact: public/build/minidump_stackwalk.tar.xz
    run-on-projects:
        - trunk

@ -71,7 +71,7 @@ linux64-breakpad-injector:
    description: "breakpad injector toolchain build"
    run:
        script: build-breakpad-injector.sh
-        toolchain-artifact: public/build/injector.tar.zst
+        toolchain-artifact: public/build/injector.tar.xz
    treeherder:
        symbol: TL(injector)
    fetches:
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@ -22,7 +22,7 @@ linux64-infer:
        resources:
            - 'build/build-infer/build-infer.py'
            - 'build/build-infer/infer-linux64.json'
-        toolchain-artifact: public/build/infer.tar.zst
+        toolchain-artifact: public/build/infer.tar.xz

 linux64-llvm-dsymutil:
    description: "llvm-dsymutil toolchain build"
@ -30,7 +30,7 @@ linux64-llvm-dsymutil:
        symbol: TL(dsymutil)
    run:
        script: build-llvm-dsymutil.sh
-        toolchain-artifact: public/build/llvm-dsymutil.tar.zst
+        toolchain-artifact: public/build/llvm-dsymutil.tar.xz
    fetches:
        fetch:
            - clang-11
@ -45,7 +45,7 @@ linux64-binutils-2.31.1:
        script: build-binutils-linux.sh
        resources:
            - 'build/unix/build-binutils/build-binutils.sh'
-        toolchain-artifact: public/build/binutils.tar.zst
+        toolchain-artifact: public/build/binutils.tar.xz
    fetches:
        fetch:
            - binutils-2.31.1
@ -64,7 +64,7 @@ linux64-binutils:
        script: build-binutils-linux.sh
        resources:
            - 'build/unix/build-binutils/build-binutils.sh'
-        toolchain-artifact: public/build/binutils.tar.zst
+        toolchain-artifact: public/build/binutils.tar.xz
    fetches:
        fetch:
            - binutils-2.36.1
@ -83,7 +83,7 @@ linux64-hfsplus:
        script: build-hfsplus-linux.sh
        resources:
            - 'build/unix/build-hfsplus/build-hfsplus.sh'
-        toolchain-artifact: public/build/hfsplus-tools.tar.zst
+        toolchain-artifact: public/build/hfsplus-tools.tar.xz
    fetches:
        fetch:
            - hfsplus-tools
@ -96,7 +96,7 @@ linux64-libdmg:
        symbol: TL(libdmg-hfs+)
    run:
        script: build-libdmg-hfsplus.sh
-        toolchain-artifact: public/build/dmg.tar.zst
+        toolchain-artifact: public/build/dmg.tar.xz
    fetches:
        fetch:
            - libdmg-hfsplus
@ -115,7 +115,7 @@ linux64-mar-tools:
    run:
        script: build-mar-tools.sh
        sparse-profile: null
-        toolchain-artifact: public/build/mar-tools.tar.zst
+        toolchain-artifact: public/build/mar-tools.tar.xz
        resources:
            - build/moz.configure
            - modules/libmar/
@ -132,7 +132,7 @@ linux64-upx:
        tier: 1
    run:
        script: build-upx.sh
-        toolchain-artifact: public/build/upx.tar.zst
+        toolchain-artifact: public/build/upx.tar.xz

 linux64-msix-packaging:
    description: "msix-packaging build"
@ -159,11 +159,11 @@ linux64-custom-v8:
    run:
        script: build-custom-v8.sh
        arguments: [
-            d8.tar.zst,
+            d8.zip,
            is_debug=false,
            target_cpu="x64"
        ]
-        toolchain-artifact: public/build/d8.tar.zst
+        toolchain-artifact: public/build/d8.zip

 browsertime:
    description: "npm install browsertime node_modules"
@ -176,7 +176,7 @@ browsertime:
            - 'tools/browsertime/package.json'
            - 'tools/browsertime/package-lock.json'
            - 'tools/browsertime/mach_commands.py'
-        toolchain-artifact: public/build/browsertime.tar.zst
+        toolchain-artifact: public/build/browsertime.tar.bz2
    fetches:
        toolchain:
            - linux64-node
@ -193,7 +193,7 @@ wrench-deps:
        resources:
            - 'gfx/wr/Cargo.lock'
            - 'gfx/wr/ci-scripts/install-meson.sh'
-        toolchain-artifact: public/build/wrench-deps.tar.zst
+        toolchain-artifact: public/build/wrench-deps.tar.bz2
    fetches:
        fetch:
            - android-rs-glue
@ -207,7 +207,7 @@ linux64-liblowercase:
    run:
        script: build-liblowercase.sh
        sparse-profile: liblowercase
-        toolchain-artifact: public/build/liblowercase.tar.zst
+        toolchain-artifact: public/build/liblowercase.tar.xz
        resources:
            - build/liblowercase/
    fetches:
@ -223,7 +223,7 @@ linux64-wine:
        max-run-time: 10800
    run:
        script: build-wine.sh
-        toolchain-artifact: public/build/wine.tar.zst
+        toolchain-artifact: public/build/wine.tar.xz
    fetches:
        fetch:
            - wine
@ -235,13 +235,13 @@ win32-pdbstr:
    worker-type: b-win2012
    worker:
        artifacts:
-            - name: project/gecko/pdbstr/pdbstr.tar.zst
-              path: pdbstr.tar.zst
+            - name: project/gecko/pdbstr/pdbstr.tar.bz2
+              path: pdbstr.tar.bz2
              type: file
    run:
        script: exfiltrate-pdbstr.sh
        arguments: ['x86']
-        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.zst
+        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.bz2

 win64-pdbstr:
    description: "pdbstr for 64-bits Windows"
@ -250,13 +250,13 @@ win64-pdbstr:
    worker-type: b-win2012
    worker:
        artifacts:
-            - name: project/gecko/pdbstr/pdbstr.tar.zst
-              path: pdbstr.tar.zst
+            - name: project/gecko/pdbstr/pdbstr.tar.bz2
+              path: pdbstr.tar.bz2
              type: file
    run:
        script: exfiltrate-pdbstr.sh
        arguments: ['x64']
-        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.zst
+        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.bz2

 linux64-winchecksec:
    description: "winchecksec"
@ -264,7 +264,7 @@ linux64-winchecksec:
        symbol: TL(winchecksec)
    run:
        script: build-winchecksec.sh
-        toolchain-artifact: public/build/winchecksec.tar.zst
+        toolchain-artifact: public/build/winchecksec.tar.bz2
        tooltool-downloads: internal
    fetches:
        fetch:
@ -279,7 +279,7 @@ win64-winchecksec:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
    run:
        script: build-winchecksec.sh
-        toolchain-artifact: public/build/winchecksec.tar.zst
+        toolchain-artifact: public/build/winchecksec.tar.bz2
        tooltool-downloads: internal
    fetches:
        fetch:
@ -311,7 +311,7 @@ win64-mozmake:
    worker-type: b-win2012
    run:
        script: build-mozmake.sh
-        toolchain-artifact: public/build/mozmake.tar.zst
+        toolchain-artifact: public/build/mozmake.tar.bz2
        tooltool-downloads: internal
    fetches:
        fetch:
--- a/taskcluster/ci/toolchain/nasm.yml
+++ b/taskcluster/ci/toolchain/nasm.yml
@ -8,7 +8,7 @@ job-defaults:
        max-run-time: 1800
    run-on-projects: [trunk]
    run:
-        toolchain-artifact: public/build/nasm.tar.zst
+        toolchain-artifact: public/build/nasm.tar.bz2

 win64-nasm:
    description: "nasm win64 build"
--- a/taskcluster/ci/toolchain/resourcemonitor.yml
+++ b/taskcluster/ci/toolchain/resourcemonitor.yml
@ -13,7 +13,7 @@ job-defaults:
    run:
        script: build-resourcemonitor.sh
        sparse-profile: null
-        toolchain-artifact: public/build/resource-monitor.tar.zst
+        toolchain-artifact: public/build/resource-monitor.tar.xz

 linux64-resource-monitor:
    description: "linux64 resourcemonitor toolchain build"
--- a/taskcluster/ci/toolchain/rust-size.yml
+++ b/taskcluster/ci/toolchain/rust-size.yml
@ -17,7 +17,7 @@ linux64-rust-size:
        symbol: TL(rust-size)
    worker-type: b-linux
    run:
-        toolchain-artifact: public/build/rust-size.tar.zst
+        toolchain-artifact: public/build/rust-size.tar.xz
    fetches:
        toolchain:
            - linux64-rust-1.47
@ -30,7 +30,7 @@ win64-rust-size:
        env:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
    run:
-        toolchain-artifact: public/build/rust-size.tar.zst
+        toolchain-artifact: public/build/rust-size.tar.bz2
        resources:
            - 'taskcluster/scripts/misc/tooltool-download.sh'
        tooltool-downloads: internal
--- a/taskcluster/ci/toolchain/sccache.yml
+++ b/taskcluster/ci/toolchain/sccache.yml
@ -23,7 +23,7 @@ linux64-sccache:
    worker:
        max-run-time: 1800
    run:
-        toolchain-artifact: public/build/sccache.tar.zst
+        toolchain-artifact: public/build/sccache.tar.xz
    fetches:
        toolchain:
            - linux64-rust-1.47
@ -39,7 +39,7 @@ macosx64-sccache:
        max-run-time: 1800
    run:
        arguments: ['x86_64-apple-darwin']
-        toolchain-artifact: public/build/sccache.tar.zst
+        toolchain-artifact: public/build/sccache.tar.xz
    fetches:
        toolchain:
            - linux64-rust-macos-1.47
@ -56,7 +56,7 @@ macosx64-aarch64-sccache:
        max-run-time: 1800
    run:
        arguments: ['aarch64-apple-darwin']
-        toolchain-artifact: public/build/sccache.tar.zst
+        toolchain-artifact: public/build/sccache.tar.xz
    fetches:
        toolchain:
            - linux64-rust-macos-1.49
@ -74,7 +74,7 @@ win64-sccache:
        env:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
    run:
-        toolchain-artifact: public/build/sccache.tar.zst
+        toolchain-artifact: public/build/sccache.tar.bz2
        resources:
            - 'taskcluster/scripts/misc/tooltool-download.sh'
        tooltool-downloads: internal
--- a/taskcluster/docker/custom-v8/Dockerfile
+++ b/taskcluster/docker/custom-v8/Dockerfile
@ -18,4 +18,4 @@ RUN apt-get update && \
      tar \
      unzip \
      wget \
-      zstd
+      zip
--- a/taskcluster/scripts/misc/browsertime.sh
+++ b/taskcluster/scripts/misc/browsertime.sh
@ -16,4 +16,4 @@ export PATH=$PATH:$MOZ_FETCHES_DIR/node/bin
 # browsertime/{package.json,node_modules}.
 mkdir -p  /builds/worker/artifacts
 cd tools
-tar caf /builds/worker/artifacts/browsertime.tar.zst browsertime
+tar cjf /builds/worker/artifacts/browsertime.tar.bz2 browsertime
--- a/taskcluster/scripts/misc/build-breakpad-injector.sh
+++ b/taskcluster/scripts/misc/build-breakpad-injector.sh
@ -3,7 +3,7 @@ set -x -e -v

 # This script is for building libbreakpadinjector.so, currently for linux only

-COMPRESS_EXT=zst
+COMPRESS_EXT=xz

 cd $GECKO_PATH

--- a/taskcluster/scripts/misc/build-cbindgen.sh
+++ b/taskcluster/scripts/misc/build-cbindgen.sh
@ -3,11 +3,14 @@ set -x -e -v

 # Needed by osx-cross-linker.
 export TARGET="$1"
-COMPRESS_EXT=zst

 case "$(uname -s)" in
+Linux)
+    COMPRESS_EXT=xz
+    ;;
 MINGW*)
    UPLOAD_DIR=$PWD/public/build
+    COMPRESS_EXT=bz2

    . $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh

@ -46,7 +49,7 @@ cargo build --verbose --release --target "$TARGET"

 mkdir cbindgen
 cp target/$TARGET/release/cbindgen* cbindgen/
-tar -c cbindgen | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > cbindgen.tar.$COMPRESS_EXT
+tar -acf cbindgen.tar.$COMPRESS_EXT cbindgen
 mkdir -p $UPLOAD_DIR
 cp cbindgen.tar.$COMPRESS_EXT $UPLOAD_DIR

--- a/taskcluster/scripts/misc/build-cctools-port.sh
+++ b/taskcluster/scripts/misc/build-cctools-port.sh
@ -94,4 +94,4 @@ done)

 # Put a tarball in the artifacts dir
 mkdir -p $UPLOAD_DIR
-tar caf $UPLOAD_DIR/cctools.tar.zst -C $CROSSTOOLS_BUILD_DIR/.. `basename $CROSSTOOLS_BUILD_DIR`
+tar cJf $UPLOAD_DIR/cctools.tar.xz -C $CROSSTOOLS_BUILD_DIR/.. `basename $CROSSTOOLS_BUILD_DIR`
--- a/taskcluster/scripts/misc/build-custom-v8.sh
+++ b/taskcluster/scripts/misc/build-custom-v8.sh
@ -2,7 +2,7 @@
 set -x -e -v

 # This script is for building a custom version of V8
-ARTIFACT_NAME='d8.tar.zst'
+ARTIFACT_NAME='d8.zip'
 CONFIG='is_debug=false target_cpu="x64"'
 if [[ $# -eq 0 ]]; then
    echo "Using default configuration for v8 build."
@ -41,7 +41,7 @@ cp -R v8/out/release d8
 cp -R v8/include d8
 chmod -R +x d8

-tar caf $ARTIFACT_NAME d8
+zip -r $ARTIFACT_NAME d8

 mkdir -p $UPLOAD_DIR
 cp $ARTIFACT_NAME $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-dump-syms.sh
+++ b/taskcluster/scripts/misc/build-dump-syms.sh
@ -5,11 +5,14 @@ PROJECT=dump_syms
 # Needed by osx-cross-linker.
 export TARGET=$1

-COMPRESS_EXT=zst
 # This script is for building dump_syms
 case "$(uname -s)" in
+Linux)
+    COMPRESS_EXT=xz
+    ;;
 MINGW*)
    UPLOAD_DIR=$PWD/public/build
+    COMPRESS_EXT=bz2

    . $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
    ;;
@ -62,7 +65,7 @@ if [ -n "$TARGET" ]; then
    PROJECT_OUT=target/${TARGET}/release/${PROJECT}*
 fi
 cp ${PROJECT_OUT} ${PROJECT}/
-tar -c $PROJECT | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > ${PROJECT}.tar.$COMPRESS_EXT
+tar -acf ${PROJECT}.tar.$COMPRESS_EXT $PROJECT
 mkdir -p $UPLOAD_DIR
 cp ${PROJECT}.tar.$COMPRESS_EXT $UPLOAD_DIR

--- a/taskcluster/scripts/misc/build-fix-stacks.sh
+++ b/taskcluster/scripts/misc/build-fix-stacks.sh
@ -6,10 +6,10 @@ PROJECT=fix-stacks

 export TARGET="$1"

-COMPRESS_EXT=zst
 case "$TARGET" in
 x86_64-unknown-linux-gnu)
    EXE=
+    COMPRESS_EXT=xz
    # {CC,CXX} and TARGET_{CC,CXX} must be set because a build.rs file builds
    # some C and C++ code.
    export CC=$MOZ_FETCHES_DIR/clang/bin/clang
@ -21,6 +21,7 @@ x86_64-unknown-linux-gnu)
 *-apple-darwin)
    # Cross-compiling for Mac on Linux.
    EXE=
+    COMPRESS_EXT=xz
    # {CC,CXX} and TARGET_{CC,CXX} must be set because a build.rs file builds
    # some C and C++ code.
    export CC=$MOZ_FETCHES_DIR/clang/bin/clang
@ -36,6 +37,7 @@ x86_64-unknown-linux-gnu)
 i686-pc-windows-msvc)
    # Cross-compiling for Windows on Linux.
    EXE=.exe
+    COMPRESS_EXT=bz2
    # Some magic that papers over differences in case-sensitivity/insensitivity on Linux
    # and Windows file systems.
    export LD_PRELOAD="/builds/worker/fetches/liblowercase/liblowercase.so"
--- a/taskcluster/scripts/misc/build-gn-common.sh
+++ b/taskcluster/scripts/misc/build-gn-common.sh
@ -59,5 +59,5 @@ if test "$MAC_CROSS" = "" -a "$(uname)" = "Linux"; then
 fi
 cp out/gn $STAGE

-tar -c $STAGE | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > gn.tar.$COMPRESS_EXT
+tar -acf gn.tar.$COMPRESS_EXT $STAGE
 cp gn.tar.$COMPRESS_EXT $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-gn-linux.sh
+++ b/taskcluster/scripts/misc/build-gn-linux.sh
@ -4,7 +4,7 @@ set -e -v
 # This script is for building GN on Linux.

 WORKSPACE=$HOME/workspace
-COMPRESS_EXT=zst
+COMPRESS_EXT=xz
 export CC=$MOZ_FETCHES_DIR/gcc/bin/gcc
 export CXX=$MOZ_FETCHES_DIR/gcc/bin/g++
 export LDFLAGS=-lrt
--- a/taskcluster/scripts/misc/build-gn-macosx.sh
+++ b/taskcluster/scripts/misc/build-gn-macosx.sh
@ -4,7 +4,7 @@ set -e -v
 # This script is for building GN.

 WORKSPACE=$HOME/workspace
-COMPRESS_EXT=zst
+COMPRESS_EXT=xz

 CROSS_CCTOOLS_PATH=$MOZ_FETCHES_DIR/cctools
 CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.12.sdk
--- a/taskcluster/scripts/misc/build-grcov.sh
+++ b/taskcluster/scripts/misc/build-grcov.sh
@ -4,10 +4,11 @@ set -x -e -v
 # This script is for building grcov

 PROJECT=grcov
-COMPRESS_EXT=zst

 case "$(uname -s)" in
 Linux)
+    COMPRESS_EXT=xz
+
    export CC=clang
    export CXX=clang++
    export RUSTFLAGS=-Clinker=clang++
@ -17,6 +18,7 @@ Linux)
    ;;
 MINGW*)
    UPLOAD_DIR=$PWD/public/build
+    COMPRESS_EXT=bz2

    . $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
    ;;
@ -37,7 +39,7 @@ cargo build --verbose --release
 mkdir $PROJECT
 cp target/release/${PROJECT}* ${PROJECT}/
 pushd $PROJECT
-tar -c * | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > ../${PROJECT}.tar.$COMPRESS_EXT
+tar -acf ../${PROJECT}.tar.$COMPRESS_EXT *
 popd
 mkdir -p $UPLOAD_DIR
 cp ${PROJECT}.tar.$COMPRESS_EXT $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-libdmg-hfsplus.sh
+++ b/taskcluster/scripts/misc/build-libdmg-hfsplus.sh
@ -31,4 +31,4 @@ cat >$STAGE/README<<EOF
 Source is available as a taskcluster artifact:
 $queue_base/task/$(python -c 'import json, os; print "{task}/artifacts/{artifact}".format(**next(f for f in json.loads(os.environ["MOZ_FETCHES"]) if "libdmg-hfsplus" in f["artifact"]))')
 EOF
-tar caf $UPLOAD_DIR/dmg.tar.zst -C $WORKSPACE `basename $STAGE`
+tar cf - -C $WORKSPACE `basename $STAGE` | xz > $UPLOAD_DIR/dmg.tar.xz
--- a/taskcluster/scripts/misc/build-liblowercase.sh
+++ b/taskcluster/scripts/misc/build-liblowercase.sh
@ -14,6 +14,6 @@ cargo build --verbose --release --target-dir $WORKSPACE/obj
 mkdir $WORKSPACE/liblowercase
 cp $WORKSPACE/obj/release/liblowercase.so $WORKSPACE/liblowercase
 strip $WORKSPACE/liblowercase/liblowercase.so
-tar -C $WORKSPACE -acf $WORKSPACE/liblowercase.tar.zst liblowercase
+tar -C $WORKSPACE -acf $WORKSPACE/liblowercase.tar.xz liblowercase
 mkdir -p $UPLOAD_DIR
-cp $WORKSPACE/liblowercase.tar.zst $UPLOAD_DIR
+cp $WORKSPACE/liblowercase.tar.xz $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-llvm-dsymutil.sh
+++ b/taskcluster/scripts/misc/build-llvm-dsymutil.sh
@ -19,7 +19,7 @@ cmake \

 ninja dsymutil llvm-symbolizer

-tar --xform='s,^,llvm-dsymutil/,' -caf llvm-dsymutil.tar.zst bin/dsymutil bin/llvm-symbolizer
+tar --xform='s,^,llvm-dsymutil/,' -Jcf llvm-dsymutil.tar.xz bin/dsymutil bin/llvm-symbolizer

 mkdir -p $UPLOAD_DIR
-cp llvm-dsymutil.tar.zst $UPLOAD_DIR
+cp llvm-dsymutil.tar.xz $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-mar-tools.sh
+++ b/taskcluster/scripts/misc/build-mar-tools.sh
@ -3,7 +3,7 @@ set -x -e -v

 # This script is for building mar and mbsdiff

-COMPRESS_EXT=zst
+COMPRESS_EXT=xz

 cd $GECKO_PATH

--- a/taskcluster/scripts/misc/build-mingw-fxc2-x86.sh
+++ b/taskcluster/scripts/misc/build-mingw-fxc2-x86.sh
@ -19,7 +19,7 @@ cp dll/d3dcompiler_47_32.dll $INSTALL_DIR/bin/d3dcompiler_47.dll
 # --------------

 cd $WORKSPACE
-tar caf fxc2.tar.zst fxc2
+tar caf fxc2.tar.xz fxc2

 mkdir -p $UPLOAD_DIR
 cp fxc2.tar.* $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-mingw32-nsis.sh
+++ b/taskcluster/scripts/misc/build-mingw32-nsis.sh
@ -41,7 +41,7 @@ scons XGCC_W32_PREFIX=i686-w64-mingw32- ZLIB_W32=../zlib-1.2.11 SKIPUTILS="NSIS

 cd $MOZ_FETCHES_DIR

-tar caf nsis.tar.zst mingw32
+tar caf nsis.tar.xz mingw32

 mkdir -p $UPLOAD_DIR
 cp nsis.tar.* $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-minidump-stackwalk.sh
+++ b/taskcluster/scripts/misc/build-minidump-stackwalk.sh
@ -3,7 +3,7 @@ set -x -e -v

 # This script is for building minidump_stackwalk

-COMPRESS_EXT=zst
+COMPRESS_EXT=xz

 cd $GECKO_PATH

--- a/taskcluster/scripts/misc/build-mozmake.sh
+++ b/taskcluster/scripts/misc/build-mozmake.sh
@ -56,8 +56,8 @@ cmd /c build_w32.bat
 mkdir mozmake
 cp WinRel/gnumake.exe mozmake/mozmake.exe

-tar -c mozmake | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > mozmake.tar.zst
+tar -acf mozmake.tar.bz2 mozmake
 mkdir -p $UPLOAD_DIR
-cp mozmake.tar.zst $UPLOAD_DIR
+cp mozmake.tar.bz2 $UPLOAD_DIR

 . $GECKO_PATH/taskcluster/scripts/misc/vs-cleanup.sh
--- a/taskcluster/scripts/misc/build-nasm.sh
+++ b/taskcluster/scripts/misc/build-nasm.sh
@ -1,7 +1,7 @@
 #!/bin/bash
 set -x -e -v

-COMPRESS_EXT=zst
+COMPRESS_EXT=bz2

 if [ -n "$TOOLTOOL_MANIFEST" ]; then
  . $GECKO_PATH/taskcluster/scripts/misc/tooltool-download.sh
--- a/taskcluster/scripts/misc/build-resourcemonitor.sh
+++ b/taskcluster/scripts/misc/build-resourcemonitor.sh
@ -2,7 +2,7 @@
 set -x -e -v

 cd "$MOZ_FETCHES_DIR"/resource-monitor/ || exit 1
-COMPRESS_EXT=zst
+COMPRESS_EXT=xz

 PATH="$MOZ_FETCHES_DIR/go/bin:$PATH"
 export PATH
--- a/taskcluster/scripts/misc/build-rust-size.sh
+++ b/taskcluster/scripts/misc/build-rust-size.sh
@ -2,14 +2,15 @@
 set -x -e -v

 PROJECT=rust-size
-COMPRESS_EXT=zst

 # This script is for building rust-size
 case "$(uname -s)" in
 Linux)
+    COMPRESS_EXT=xz
    ;;
 MINGW*)
    UPLOAD_DIR=$PWD/public/build
+    COMPRESS_EXT=bz2

    . $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
    ;;
@ -29,7 +30,7 @@ cargo build --verbose --release

 mkdir $PROJECT
 cp target/release/${PROJECT}* ${PROJECT}/
-tar -c $PROJECT | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > ${PROJECT}.tar.$COMPRESS_EXT
+tar -acf ${PROJECT}.tar.$COMPRESS_EXT $PROJECT
 mkdir -p $UPLOAD_DIR
 cp ${PROJECT}.tar.$COMPRESS_EXT $UPLOAD_DIR

--- a/taskcluster/scripts/misc/build-sccache.sh
+++ b/taskcluster/scripts/misc/build-sccache.sh
@ -6,13 +6,14 @@ export TARGET="$1"

 # This script is for building sccache

-COMPRESS_EXT=zst
 case "$(uname -s)" in
 Linux)
+    COMPRESS_EXT=xz
    PATH="$MOZ_FETCHES_DIR/binutils/bin:$PATH"
    ;;
 MINGW*)
    UPLOAD_DIR=$PWD/public/build
+    COMPRESS_EXT=bz2

    . $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
    ;;
@ -64,7 +65,7 @@ fi

 mkdir sccache
 cp $SCCACHE_OUT sccache/
-tar -c sccache | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > sccache.tar.$COMPRESS_EXT
+tar -acf sccache.tar.$COMPRESS_EXT sccache
 mkdir -p $UPLOAD_DIR
 cp sccache.tar.$COMPRESS_EXT $UPLOAD_DIR

--- a/taskcluster/scripts/misc/build-upx.sh
+++ b/taskcluster/scripts/misc/build-upx.sh
@ -20,7 +20,7 @@ cp upx.out $INSTALL_DIR/bin/upx
 # --------------

 cd $WORKSPACE
-tar caf upx.tar.zst upx
+tar caf upx.tar.xz upx

 mkdir -p $UPLOAD_DIR
 cp upx.tar.* $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-winchecksec.sh
+++ b/taskcluster/scripts/misc/build-winchecksec.sh
@ -49,5 +49,5 @@ eval cmake \
 ninja -v

 cd ..
-tar -caf winchecksec.tar.zst winchecksec/winchecksec${TOOLTOOL_MANIFEST:+.exe}
-cp winchecksec.tar.zst $UPLOAD_DIR/
+tar -caf winchecksec.tar.bz2 winchecksec/winchecksec${TOOLTOOL_MANIFEST:+.exe}
+cp winchecksec.tar.bz2 $UPLOAD_DIR/
--- a/taskcluster/scripts/misc/build-wine.sh
+++ b/taskcluster/scripts/misc/build-wine.sh
@ -23,7 +23,7 @@ make install
 # --------------

 cd $WORKSPACE/
-tar caf wine.tar.zst wine
+tar caf wine.tar.xz wine

 mkdir -p $UPLOAD_DIR
 cp wine.tar.* $UPLOAD_DIR
--- a/taskcluster/scripts/misc/exfiltrate-pdbstr.sh
+++ b/taskcluster/scripts/misc/exfiltrate-pdbstr.sh
@ -6,4 +6,4 @@ set -x -e -v
 mkdir pdbstr
 cp "c:/Program Files (x86)/Windows Kits/10/Debuggers/$1/srcsrv/pdbstr.exe" pdbstr

-tar -c pdbstr | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > pdbstr.tar.zst
+tar -jcvf pdbstr.tar.bz2 pdbstr
--- a/taskcluster/scripts/misc/wrench-deps-vendoring.sh
+++ b/taskcluster/scripts/misc/wrench-deps-vendoring.sh
@ -25,4 +25,4 @@ ci-scripts/install-meson.sh
 mv meson wrench-deps/meson

 mkdir -p $UPLOAD_DIR
-tar caf $UPLOAD_DIR/wrench-deps.tar.zst wrench-deps
+tar caf $UPLOAD_DIR/wrench-deps.tar.bz2 wrench-deps