Skip to content

Commit

Permalink
ci: Fix mac build versions & wasm
Browse files Browse the repository at this point in the history
  • Loading branch information
HDauven committed Dec 11, 2024
1 parent bebc73b commit de11253
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/rusk_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-24.04, macos-12, arm-linux]
os: [ubuntu-24.04, macos-15, arm-linux]
compiler: [cargo]
features: [default, archive]
include:
- os: ubuntu-24.04
target: linux-x64-libssl3
- os: macos-12
- os: macos-15
target: macos-arm64
flags: --target=aarch64-apple-darwin
- os: arm-linux
Expand All @@ -38,7 +38,15 @@ jobs:

- name: Add ARM target for Apple silicon
run: rustup target add aarch64-apple-darwin
if: ${{ matrix.os == 'macos-12' }}
if: ${{ matrix.os == 'macos-15' }}

- name: Compile keys
shell: bash
run: make keys

- name: Compile WASM Contracts
shell: bash
run: make wasm

- name: Build Rusk binary
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ruskwallet_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-12, windows-latest, arm-linux]
os: [ubuntu-20.04, ubuntu-22.04, macos-latest, macos-15, windows-latest, arm-linux]
compiler: [cargo]
include:
- os: ubuntu-20.04
Expand All @@ -33,7 +33,7 @@ jobs:
compiler: cargo
target: macos-intel

- os: macos-12
- os: macos-15
compiler: cargo
target: macos-arm64
flags: --target=aarch64-apple-darwin
Expand All @@ -60,7 +60,7 @@ jobs:

- name: Add arm target for Apple Silicon build
run: rustup target add aarch64-apple-darwin
if: ${{ matrix.os == 'macos-12' }}
if: ${{ matrix.os == 'macos-15' }}

- name: Build Wallet
shell: bash
Expand Down

0 comments on commit de11253

Please sign in to comment.