From 713a21604f109f2044c929c385c59de0b69cbf49 Mon Sep 17 00:00:00 2001
From: Ben Hearsum <ben@mozilla.com>
Date: Mon, 15 May 2023 10:33:37 -0400
Subject: [PATCH] Package toolchain binaries in tarballs

This avoids losing the execute bit on them when we download them in subsequent tasks.
---
 taskcluster/ci/toolchain/kind.yml                  | 4 ++--
 taskcluster/scripts/toolchain/build-extract-lex.sh | 4 +++-
 taskcluster/scripts/toolchain/build-preprocess.sh  | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/taskcluster/ci/toolchain/kind.yml b/taskcluster/ci/toolchain/kind.yml
index 492afe9ff..fb0bfb211 100644
--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -76,7 +76,7 @@ tasks:
             script: build-preprocess.sh
             resources:
                 - taskcluster/scripts/toolchain/build-preprocess.sh
-            toolchain-artifact: public/build/dedupe
+            toolchain-artifact: public/build/dedupe.tar.zst
         fetches:
             fetch:
                 - preprocess
@@ -89,7 +89,7 @@ tasks:
             script: build-extract-lex.sh
             resources:
                 - taskcluster/scripts/toolchain/build-extract-lex.sh
-            toolchain-artifact: public/build/extract_lex
+            toolchain-artifact: public/build/extract_lex.tar.zst
         fetches:
             fetch:
                 - extract-lex
diff --git a/taskcluster/scripts/toolchain/build-extract-lex.sh b/taskcluster/scripts/toolchain/build-extract-lex.sh
index 3401959cb..026b138ce 100755
--- a/taskcluster/scripts/toolchain/build-extract-lex.sh
+++ b/taskcluster/scripts/toolchain/build-extract-lex.sh
@@ -9,4 +9,6 @@ cd $build_dir
 cmake $EXTRACT_LEX_DIR
 make -j$(nproc)
 
-cp $build_dir/extract_lex $UPLOAD_DIR
+cd $build_dir
+chmod +x extract_lex
+tar --zstd -cf $UPLOAD_DIR/extract_lex.tar.zst extract_lex
diff --git a/taskcluster/scripts/toolchain/build-preprocess.sh b/taskcluster/scripts/toolchain/build-preprocess.sh
index e6935db0b..c66d6040a 100755
--- a/taskcluster/scripts/toolchain/build-preprocess.sh
+++ b/taskcluster/scripts/toolchain/build-preprocess.sh
@@ -9,4 +9,6 @@ cd $build_dir
 cmake $PREPROCESS_DIR -DBUILD_TYPE=Release
 make -j$(nproc)
 
-cp $build_dir/bin/dedupe $UPLOAD_DIR
+cd $build_dir/bin
+chmod +x dedupe
+tar --zstd -cf $UPLOAD_DIR/dedupe.tar.zst dedupe