From 9ee1d296de22f363b399df7a38d56c5796bfed1b Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 14 Jun 2024 20:07:11 +0200
Subject: [PATCH] Use GitHub's M1 macOS runner (#3266)

An M1 (aarch64, Apple Silicon) runner is available on the free plan
since January 2024 (see

https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/).
---
 .github/workflows/kani-m1.yml               | 27 ---------------------
 .github/workflows/kani.yml                  |  2 +-
 .github/workflows/release.yml               | 26 ++++++++++++++++++++
 scripts/setup/{macos-13-xlarge => macos-14} |  0
 4 files changed, 27 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/kani-m1.yml
 rename scripts/setup/{macos-13-xlarge => macos-14} (100%)

diff --git a/.github/workflows/kani-m1.yml b/.github/workflows/kani-m1.yml
deleted file mode 100644
index 0f884f2fe013..000000000000
--- a/.github/workflows/kani-m1.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright Kani Contributors
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-
-# Run the regression job on Apple M1 only on commits to `main`
-name: Kani CI M1
-on:
-  push:
-    branches:
-      - 'main'
-
-env:
-  RUST_BACKTRACE: 1
-
-jobs:
-  regression:
-    runs-on: macos-13-xlarge
-    steps:
-      - name: Checkout Kani
-        uses: actions/checkout@v4
-
-      - name: Setup Kani Dependencies
-        uses: ./.github/actions/setup
-        with:
-          os: macos-13-xlarge
-
-      - name: Execute Kani regression
-        run: ./scripts/kani-regression.sh
diff --git a/.github/workflows/kani.yml b/.github/workflows/kani.yml
index d98e0a2b0a5b..dd077eff25e1 100644
--- a/.github/workflows/kani.yml
+++ b/.github/workflows/kani.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, ubuntu-20.04, ubuntu-22.04]
+        os: [macos-13, ubuntu-20.04, ubuntu-22.04, macos-14]
     steps:
       - name: Checkout Kani
         uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4ae93c291484..75bafefd6799 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,6 +44,32 @@ jobs:
           os: macos-13
           arch: x86_64-apple-darwin
 
+  build_bundle_macos_aarch64:
+    name: BuildBundle-MacOs-ARM
+    runs-on: macos-14
+    permissions:
+      contents: write
+    outputs:
+      version: ${{ steps.bundle.outputs.version }}
+      bundle: ${{ steps.bundle.outputs.bundle }}
+      package: ${{ steps.bundle.outputs.package }}
+      crate_version: ${{ steps.bundle.outputs.crate_version }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Kani Dependencies
+        uses: ./.github/actions/setup
+        with:
+          os: macos-14
+
+      - name: Build bundle
+        id: bundle
+        uses: ./.github/actions/build-bundle
+        with:
+          os: macos-14
+          arch: aarch64-apple-darwin
+
   build_bundle_linux:
     name: BuildBundle-Linux
     runs-on: ubuntu-20.04
diff --git a/scripts/setup/macos-13-xlarge b/scripts/setup/macos-14
similarity index 100%
rename from scripts/setup/macos-13-xlarge
rename to scripts/setup/macos-14