From 2f00e8f9a96b286276c428c6c996a0eb66d3c2c8 Mon Sep 17 00:00:00 2001
From: Damian Shaw <damian.peter.shaw@gmail.com>
Date: Sat, 23 Mar 2024 23:42:39 -0400
Subject: [PATCH 1/2] Run CI Tests on MacOS Arm

---
 .github/workflows/ci.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14718ddcb6b..87e8c0a7da6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,7 +107,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-12]
+        # Run on both x86 and Arm MacOS according to:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        os: [ubuntu-latest, macos-12, macos-latest]
         python:
           - "3.8"
           - "3.9"
@@ -115,6 +117,12 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
+        exclude:
+          # MacOS Arm failing on Python < 3.10
+          - os: macos-latest
+            python: "3.8"
+          - os: macos-latest
+            python: "3.9"
 
     steps:
       - uses: actions/checkout@v4
@@ -129,10 +137,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install bzr
 
-      - name: Install MacOS dependencies
+      - name: Install MacOS x86 dependencies
         if: matrix.os == 'macos-12'
         run: brew install breezy
 
+      - name: Install MacOS Arm dependencies
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew install breezy
+          brew install subversion
+
       - run: pip install nox
 
       # Main check
@@ -150,7 +164,7 @@ jobs:
 
   tests-windows:
     name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     needs: [packaging, determine-changes]
     if: >-
@@ -160,7 +174,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [Windows]
+        os: [windows-latest]
         python:
           - "3.8"
           # Commented out, since Windows tests are expensively slow,

From 128e32d05a64466e2a7c1741cf8bf6d8663431fb Mon Sep 17 00:00:00 2001
From: Damian Shaw <damian.peter.shaw@gmail.com>
Date: Sun, 24 Mar 2024 00:13:30 -0400
Subject: [PATCH 2/2] NEWS ENTRY

---
 news/12593.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12593.trivial.rst

diff --git a/news/12593.trivial.rst b/news/12593.trivial.rst
new file mode 100644
index 00000000000..a3bdf662870
--- /dev/null
+++ b/news/12593.trivial.rst
@@ -0,0 +1 @@
+Enable MacOS ARM CI