From e748fe2f9bb0192ca2ad081a865507fa1828e9f4 Mon Sep 17 00:00:00 2001
From: anthony sottile <anthony.sottile@sentry.io>
Date: Fri, 2 Feb 2024 06:47:10 -0500
Subject: [PATCH] ref: build macos arm64 on github actions

---
 .cirrus.yml                 | 14 --------------
 .github/workflows/build.yml |  9 ++++++---
 packages.ini                |  3 +++
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8baa9012..f2297bb0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,17 +1,3 @@
-macos_task:
-  name: macos-arm64
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-base:latest
-  env:
-    PATH: ${CIRRUS_WORKING_DIR}/venv/bin:${CIRRUS_WORKING_DIR}/pythons/cp38-cp38/bin:${CIRRUS_WORKING_DIR}/pythons/cp39-cp39/bin:${CIRRUS_WORKING_DIR}/pythons/cp310-cp310/bin:${CIRRUS_WORKING_DIR}/pythons/cp311-cp311/bin:${PATH}
-  setup_pythons_script: python3 -u docker/install-pythons --dest pythons
-  setup_venv_script: python3 -um venv venv && pip install -r docker/requirements.txt
-  script:
-  - python3 -um build --pypi-url https://pypi.devinfra.sentry.io
-  - python3 -um validate --index-url https://pypi.devinfra.sentry.io/simple
-  artifacts:
-    path: dist/*
-
 linux_task:
   name: linux-arm64
   arm_container:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92aabde6..5f10d786 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,10 @@ jobs:
         name: dist-linux
         path: dist/*
   macos:
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        runs-on: [macos-14, macos-latest]
+    runs-on: ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v3
     - run: python3 -u docker/install-pythons --dest pythons
@@ -34,14 +37,14 @@ jobs:
     - run: python3 -um validate --index-url https://pypi.devinfra.sentry.io/simple
     - uses: actions/upload-artifact@v3
       with:
-        name: dist-macos
+        name: dist-${{ matrix.runs-on }}
         path: dist/*
 
   cirrus:
     if: github.event_name != 'pull_request'
     strategy:
       matrix:
-        task: [macos-arm64, linux-arm64]
+        task: [linux-arm64]
     runs-on: ubuntu-latest
     permissions:
       checks: read
diff --git a/packages.ini b/packages.ini
index 16031735..a46e4745 100644
--- a/packages.ini
+++ b/packages.ini
@@ -667,6 +667,9 @@ brew_requires = libmaxminddb
 [maxminddb==2.3.0]
 apt_requires = libmaxminddb-dev
 brew_requires = libmaxminddb
+[maxminddb==2.5.2]
+apt_requires = libmaxminddb-dev
+brew_requires = libmaxminddb
 
 [mccabe==0.6.1]
 [mccabe==0.7.0]