Merge pull request #1752 from input-output-hk/dlachaume/1751/add-macos-arm64-in-ci

Use `macOS-arm64` runner in CI

Author: dlachaume

.github/workflows/actions/build-upload-mithril-artifact/action.yml

@@ -18,6 +18,11 @@ runs:
       shell: bash
       run: echo "short_sha=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
 
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+
     - name: Add commit short sha to Cargo.tomls version
       shell: ${{ runner.os == 'Windows' && 'pwsh' || 'bash' }}
       run: |

.github/workflows/actions/prepare-distribution/action.yml

@@ -38,6 +38,15 @@ runs:
         --version "${{ inputs.version-name }}" \
         --target "macos-x64"
 
+    - name: Package distribution (macOS-arm64)
+      shell: bash
+      run: |
+        python3 ./.github/workflows/scripts/package-distribution.py \
+        --input package-macOS-arm64/ \
+        --dest package/ \
+        --version "${{ inputs.version-name }}" \
+        --target "macos-arm64"
+
     - name: Package distribution (Windows-X64)
       shell: bash
       run: |

.github/workflows/ci.yml

@@ -75,13 +75,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-12, windows-latest ]
+        os: [ macos-12, macos-14, windows-latest ]
 
         include:
           # Only build client on windows & mac
           - os: macos-12
             binaries-build-args: --bin mithril-client --features bundle_openssl
             libraries-build-args: --package mithril-stm --package mithril-client --features full,unstable
+          - os: macos-14
+            binaries-build-args: --bin mithril-client --features bundle_openssl
+            libraries-build-args: --package mithril-stm --package mithril-client --features full,unstable
           - os: windows-latest
             # Use `--bins --package <package>` instead of `--bin <package>`, otherwise the 'windows' compatibility
             # hack in mithril common cargo.toml doesn't apply (we have no idea why).
@@ -163,14 +166,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-12, windows-latest ]
+        os: [ ubuntu-22.04, macos-12, macos-14, windows-latest ]
 
         include:
           - os: ubuntu-22.04
             test-args: --features full,unstable --workspace
           # Only test client on windows & mac (since its the only binaries supported for those os for now)
           - os: macos-12
             test-args: --package mithril-client --package mithril-client-cli --features full,unstable
+          - os: macos-14
+            test-args: --package mithril-client --package mithril-client-cli --features full,unstable
           - os: windows-latest
             test-args: --package mithril-client --package mithril-client-cli --features full,unstable
 
@@ -520,6 +525,12 @@ jobs:
           name: mithril-distribution-macOS-X64
           path: ./package-macOS-X64
 
+      - name: Download built artifacts (macOS-arm64)
+        uses: actions/download-artifact@v4
+        with:
+          name: mithril-distribution-macOS-arm64
+          path: ./package-macOS-arm64
+
       - name: Download built artifacts (Windows-X64)
         uses: actions/download-artifact@v4
         with:

.github/workflows/pre-release.yml

@@ -45,6 +45,15 @@ jobs:
           workflow: ci.yml
           workflow_conclusion: success
 
+      - name: Download built artifacts (macOS-arm64)
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          name: mithril-distribution-macOS-arm64
+          path: ./package-macOS-arm64
+          commit: ${{ github.sha }}
+          workflow: ci.yml
+          workflow_conclusion: success
+
       - name: Download built artifacts (Windows-x64)
         uses: dawidd6/action-download-artifact@v3
         with:

.github/workflows/test-client.yml

@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-12, windows-latest ]
+        os: [ ubuntu-22.04, macos-12, macos-14, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources

CHANGELOG.md

@@ -15,6 +15,8 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 - Implement a lock mechanism on `SignedEntityType` to prevent concurrent work on a same entity type.
 
+- Extended CI build and test steps for MacOS `arm64` runners and include pre-built binaries for MacOS `arm64` in the releases.
+
 - **UNSTABLE** Cardano transactions certification:
   - Optimize the performances of the computation of the proof with a Merkle map.
   - Handle rollback events from the Cardano chain by removing stale data.