From 832fbf7fc8f285b0e7fc626c4d2c2f4e32b9d549 Mon Sep 17 00:00:00 2001
From: Hein Dauven <heindauven@gmail.com>
Date: Wed, 11 Dec 2024 17:46:15 +0100
Subject: [PATCH] ci: Fix mac build versions & wasm

---
 .github/workflows/rusk_build.yml       | 24 ++++++++++++++++--------
 .github/workflows/ruskwallet_build.yml |  6 +++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/rusk_build.yml b/.github/workflows/rusk_build.yml
index 502f588d3..3a2a6b16e 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
+            target: linux-x64
+          - os: macos-15
             target: macos-arm64
             flags: --target=aarch64-apple-darwin
           - os: arm-linux
@@ -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
@@ -47,7 +55,7 @@ jobs:
 
       - name: Extract Version
         run: |
-          export SEMVER=$(cargo pkgid --manifest-path ./rusk/Cargo.toml | perl -lpe 's/.*\@(.*)/$1/')
+          export SEMVER=$(cargo pkgid --manifest-path ./rusk/Cargo.toml | sed -E 's/.*#([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
           echo "SEMVER=$SEMVER" >> $GITHUB_ENV
 
       - name: Package Binaries
@@ -58,8 +66,8 @@ jobs:
             rusk-${{ env.SEMVER }}-${{ matrix.target }}-${{ matrix.features }}
 
       - name: Upload Binaries as Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: rusk-binaries-${{ env.SEMVER }}-${{ matrix.target }}-${{ matrix.features }}
-          path: ./*.tar.gz
+          name: rusk-${{ env.SEMVER }}-${{ matrix.target }}-${{ matrix.features }}
+          path: ./rusk-${{ env.SEMVER }}-${{ matrix.target }}-${{ matrix.features }}.tar.gz
           retention-days: 5
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