From 976fd130fdb78e465d5fd135d8455e2feead4725 Mon Sep 17 00:00:00 2001
From: "C.Lee Taylor" <47312074+leet4tari@users.noreply.github.com>
Date: Thu, 7 Mar 2024 12:10:35 +0200
Subject: [PATCH] ci(fix): add best-effort env, better concurrency rules and
 fix some typos (#326)

---
 .cargo/config.toml                                       | 4 ++--
 .github/workflows/build_cli.json                         | 3 ++-
 .github/workflows/build_cli.yml                          | 8 ++++++--
 scripts/cli/install_ubuntu_dependencies-cross_compile.sh | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index c1ae8548..235745ca 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
 
-[target.riscv64-unknown-linux-gnueabihf]
-linker = "riscv64-linux-gnueabihf-gcc"
+[target.riscv64gc-unknown-linux-gnu]
+linker = "riscv64-linux-gnu-gcc"
diff --git a/.github/workflows/build_cli.json b/.github/workflows/build_cli.json
index 3a968759..27d7b2c0 100644
--- a/.github/workflows/build_cli.json
+++ b/.github/workflows/build_cli.json
@@ -12,7 +12,8 @@
     "rust": "stable",
     "target": "aarch64-unknown-linux-gnu",
     "cross": false,
-    "build_enabled": true
+    "build_enabled": true,
+    "best-effort": true
   },
   {
     "name": "linux-riscv64",
diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
index 8de69dd6..5370c29c 100644
--- a/.github/workflows/build_cli.yml
+++ b/.github/workflows/build_cli.yml
@@ -23,8 +23,9 @@ env:
   TBN_BUNDLE_ID_BASE: "com.tarilabs"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/v') }}
 
 jobs:
   matrix-prep:
@@ -76,6 +77,9 @@ jobs:
   builds:
     name: Building ${{ matrix.builds.name }} on ${{ matrix.builds.runs-on }}
     needs: matrix-prep
+
+    continue-on-error: ${{ matrix.builds.best-effort || false }}
+
     outputs:
       LAUNCHPAD_VERSION: ${{ steps.set-tari-vars.outputs.LAUNCHPAD_VERSION }}
       TARI_NETWORK_DIR: ${{ steps.set-tari-vars.outputs.TARI_NETWORK_DIR }}
diff --git a/scripts/cli/install_ubuntu_dependencies-cross_compile.sh b/scripts/cli/install_ubuntu_dependencies-cross_compile.sh
index 495c24e0..5ed0495c 100755
--- a/scripts/cli/install_ubuntu_dependencies-cross_compile.sh
+++ b/scripts/cli/install_ubuntu_dependencies-cross_compile.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 #
-# Install Ubuntu aarch64(arm64)/riscv64gc deb dev/tool packages on x86_64
+# Install Ubuntu aarch64(arm64)/riscv64 deb dev/tool packages on x86_64
 #
 
 USAGE="Usage: $0 ISA_ARCH other packages"