From 3d0fe082259d097fd551ccf8607ee95bab135d65 Mon Sep 17 00:00:00 2001
From: adrian-kong <adrian.k1234567890@gmail.com>
Date: Thu, 9 Jun 2022 14:37:37 +1000
Subject: [PATCH 1/3] Fixing build script

---
 scripts/ci_build_rust.bash | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/ci_build_rust.bash b/scripts/ci_build_rust.bash
index f7edf2205a..cd924f5d3e 100755
--- a/scripts/ci_build_rust.bash
+++ b/scripts/ci_build_rust.bash
@@ -8,7 +8,11 @@ if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "macOS" ]; then
     BUILD_TRIPLET="$(cc -dumpmachine)"
     ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"
     EXECUTABLES=("sbp2json" "json2sbp" "json2json")
-    PACKAGE_CMD="zip ../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
+    if [ "$RUNNER_OS" == "Linux" ]; then
+      PACKAGE_CMD="zip ../../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
+    else
+      PACKAGE_CMD="zip ../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
+    fi
 elif [ "$RUNNER_OS" == "Windows" ]; then
     BUILD_TRIPLET="$(clang -dumpmachine)"
     ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"

From 22f6f3c8827690ce8189c0c1670f8032126f5ea3 Mon Sep 17 00:00:00 2001
From: adrian-kong <adrian.k1234567890@gmail.com>
Date: Thu, 9 Jun 2022 14:53:49 +1000
Subject: [PATCH 2/3] Updated build triplet to musl instead of gnu

---
 scripts/ci_build_rust.bash | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/ci_build_rust.bash b/scripts/ci_build_rust.bash
index cd924f5d3e..0b4c8f386f 100755
--- a/scripts/ci_build_rust.bash
+++ b/scripts/ci_build_rust.bash
@@ -4,15 +4,16 @@ set -ex
 
 VERSION="$(git describe --always --tags --dirty)"
 
-if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "macOS" ]; then
+if [ "$RUNNER_OS" == "macOS" ]; then
     BUILD_TRIPLET="$(cc -dumpmachine)"
     ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"
     EXECUTABLES=("sbp2json" "json2sbp" "json2json")
-    if [ "$RUNNER_OS" == "Linux" ]; then
-      PACKAGE_CMD="zip ../../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
-    else
-      PACKAGE_CMD="zip ../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
-    fi
+    PACKAGE_CMD="zip ../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
+elif [ "$RUNNER_OS" == "Linux" ]; then
+  BUILD_TRIPLET="x86_64-linux-musl"
+  ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"
+  EXECUTABLES=("sbp2json" "json2sbp" "json2json")
+  PACKAGE_CMD="zip ../../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
 elif [ "$RUNNER_OS" == "Windows" ]; then
     BUILD_TRIPLET="$(clang -dumpmachine)"
     ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"

From 0b4d68a73510ac61412eda09d4229a544b4af157 Mon Sep 17 00:00:00 2001
From: adrian-kong <adrian.k1234567890@gmail.com>
Date: Thu, 9 Jun 2022 14:54:06 +1000
Subject: [PATCH 3/3] Updated build triplet to musl instead of gnu

---
 scripts/ci_build_rust.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ci_build_rust.bash b/scripts/ci_build_rust.bash
index 0b4c8f386f..fceafcee0d 100755
--- a/scripts/ci_build_rust.bash
+++ b/scripts/ci_build_rust.bash
@@ -10,10 +10,10 @@ if [ "$RUNNER_OS" == "macOS" ]; then
     EXECUTABLES=("sbp2json" "json2sbp" "json2json")
     PACKAGE_CMD="zip ../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
 elif [ "$RUNNER_OS" == "Linux" ]; then
-  BUILD_TRIPLET="x86_64-linux-musl"
-  ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"
-  EXECUTABLES=("sbp2json" "json2sbp" "json2json")
-  PACKAGE_CMD="zip ../../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
+    BUILD_TRIPLET="x86_64-linux-musl"
+    ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"
+    EXECUTABLES=("sbp2json" "json2sbp" "json2json")
+    PACKAGE_CMD="zip ../../../$ARTIFACT_NAME ${EXECUTABLES[*]}"
 elif [ "$RUNNER_OS" == "Windows" ]; then
     BUILD_TRIPLET="$(clang -dumpmachine)"
     ARTIFACT_NAME="sbp_tools-${VERSION}-${BUILD_TRIPLET}.zip"