From c19c1a8942723cfb3db280731634975c938a401b Mon Sep 17 00:00:00 2001 From: Hein Dauven Date: Wed, 11 Dec 2024 17:46:15 +0100 Subject: [PATCH] ci: Fix mac build versions & wasm --- .github/workflows/rusk_build.yml | 12 +++++++++--- .github/workflows/ruskwallet_build.yml | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rusk_build.yml b/.github/workflows/rusk_build.yml index 502f588d3..13da85ca2 100644 --- a/.github/workflows/rusk_build.yml +++ b/.github/workflows/rusk_build.yml @@ -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 @@ -38,7 +38,13 @@ 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 WASM Contracts + shell: bash + working-directory: ./ + run: | + make wasm - name: Build Rusk binary shell: bash diff --git a/.github/workflows/ruskwallet_build.yml b/.github/workflows/ruskwallet_build.yml index 78f700429..6e94230f2 100644 --- a/.github/workflows/ruskwallet_build.yml +++ b/.github/workflows/ruskwallet_build.yml @@ -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 @@ -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 @@ -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