Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

Commit

Permalink
Replace OSX/x86 with Linux/ARM in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
HDauven committed Feb 18, 2024
1 parent 3da1081 commit 2278b22
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/wallet_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-latest, macos-11, windows-latest]
os: [ubuntu-20.04, ubuntu-22.04, macos-11, windows-latest]
compiler: [cargo]
include:
- os: ubuntu-20.04
Expand All @@ -29,9 +29,11 @@ jobs:
compiler: cargo
target: linux-x64-libssl3

- os: macos-latest
- os: ubuntu-22.04
compiler: cargo
target: macos-intel
target: linux-arm64
flags: --target=aarch64-unknown-linux-gnu
platform: aarch64-unknown-linux-gnu

- os: macos-11
compiler: cargo
Expand Down Expand Up @@ -79,7 +81,7 @@ jobs:
ls -la *.gz
- name: "Upload Wallet Artifacts"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wallet-binaries-${{env.SEMVER}}
path: |
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/wallet_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ jobs:
- run: cargo test --release
- run: cargo clippy --all-features --release -- -D warnings

test_nightly-macintel:
name: "[Mac Intel] Nightly tests"
runs-on: macos-latest
test_nightly-linux-arm:
name: "[Linux ARM] Nightly tests"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dsherret/rust-toolchain-file@v1

- name: Add arm target for Apple Silicon build
run: rustup target add aarch64-apple-darwin

- run: cargo test
- name: Install ARM OpenSSL
run: |
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
sudo apt-get install -y openssl libssl-dev pkg-config
- run: rustup target add aarch64-unknown-linux-gnu
- run: cargo test --target aarch64-unknown-linux-gnu

test_nightly-macm1:
name: "[Mac arm64] Nightly checks"
Expand Down

0 comments on commit 2278b22

Please sign in to comment.