From 9f33abde03f8579e14dea9ad84d9293b6b499a46 Mon Sep 17 00:00:00 2001 From: wcampbell Date: Sat, 3 May 2025 10:00:23 -0400 Subject: [PATCH 1/2] ci: Use arm runner for aarch64 --- .github/workflows/binaries.yml | 10 +++++----- .github/workflows/main.yml | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index d0917ec4..6e3236f2 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -21,11 +21,11 @@ jobs: fail-fast: false matrix: job: - - { target: x86_64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } - - { target: aarch64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } - - { target: arm-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } - - { target: armv7-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } - - { target: x86_64-apple-darwin, os: macos-14 } + - { target: x86_64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } + - { target: arm-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } + - { target: armv7-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } + - { target: aarch64-unknown-linux-musl, os: ubuntu-24.04-arm, use-cross: false} + - { target: x86_64-apple-darwin, os: macos-14, use-cross: false} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f261d42..7aba92b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,12 +61,11 @@ jobs: fail-fast: false matrix: job: - - { target: x86_64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } - - { target: aarch64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } - - { target: arm-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } - - { target: armv7-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } - - { target: aarch64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } - - { target: x86_64-apple-darwin, os: macos-14, } + - { target: x86_64-unknown-linux-musl, os: ubuntu-24.04, use-cross: true } + - { target: arm-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } + - { target: armv7-unknown-linux-musleabi, os: ubuntu-24.04, use-cross: true } + - { target: aarch64-unknown-linux-musl, os: ubuntu-24.04-arm, use-cross: false} + - { target: x86_64-apple-darwin, os: macos-14, use-cross: false} toolchain: - stable # msrv of backhand-cli From 778e1e90bd5fcb58425ed8a4d53bbdfb22199a6a Mon Sep 17 00:00:00 2001 From: wcampbell Date: Sun, 18 May 2025 14:16:03 -0400 Subject: [PATCH 2/2] ci: Fix cache key --- .github/workflows/cache/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cache/action.yml b/.github/workflows/cache/action.yml index 522c60ac..e4d9943c 100644 --- a/.github/workflows/cache/action.yml +++ b/.github/workflows/cache/action.yml @@ -18,5 +18,5 @@ runs: # contains package information of crates installed via `cargo install`. ~/.cargo/.crates.toml ~/.cargo/.crates2.json - key: ${{ runner.os }}-rsadsb-${{ hashFiles('**/Cargo.lock') }} - restore-keys: ${{ runner.os }}-rsadsb + key: ${{ runner.os }}-{{ runner.arch }}-0x2acache-${{ hashFiles('**/Cargo.lock') }} + restore-keys: ${{ runner.os }}-{{ runner.arch }}-0x2acache