Skip to content

Commit

Permalink
ci(fix): add best-effort env, better concurrency rules and fix some t…
Browse files Browse the repository at this point in the history
…ypos (#326)
  • Loading branch information
leet4tari authored Mar 7, 2024
1 parent 6d39634 commit 976fd13
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 2 additions & 1 deletion .github/workflows/build_cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/build_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion scripts/cli/install_ubuntu_dependencies-cross_compile.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 976fd13

Please sign in to comment.