Skip to content

Commit e748fe2

Browse files
ref: build macos arm64 on github actions
1 parent 9ba3a1f commit e748fe2

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

.cirrus.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
macos_task:
2-
name: macos-arm64
3-
macos_instance:
4-
image: ghcr.io/cirruslabs/macos-monterey-base:latest
5-
env:
6-
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}
7-
setup_pythons_script: python3 -u docker/install-pythons --dest pythons
8-
setup_venv_script: python3 -um venv venv && pip install -r docker/requirements.txt
9-
script:
10-
- python3 -um build --pypi-url https://pypi.devinfra.sentry.io
11-
- python3 -um validate --index-url https://pypi.devinfra.sentry.io/simple
12-
artifacts:
13-
path: dist/*
14-
151
linux_task:
162
name: linux-arm64
173
arm_container:

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
name: dist-linux
2222
path: dist/*
2323
macos:
24-
runs-on: macos-latest
24+
strategy:
25+
matrix:
26+
runs-on: [macos-14, macos-latest]
27+
runs-on: ${{ matrix.runs-on }}
2528
steps:
2629
- uses: actions/checkout@v3
2730
- run: python3 -u docker/install-pythons --dest pythons
@@ -34,14 +37,14 @@ jobs:
3437
- run: python3 -um validate --index-url https://pypi.devinfra.sentry.io/simple
3538
- uses: actions/upload-artifact@v3
3639
with:
37-
name: dist-macos
40+
name: dist-${{ matrix.runs-on }}
3841
path: dist/*
3942

4043
cirrus:
4144
if: github.event_name != 'pull_request'
4245
strategy:
4346
matrix:
44-
task: [macos-arm64, linux-arm64]
47+
task: [linux-arm64]
4548
runs-on: ubuntu-latest
4649
permissions:
4750
checks: read

packages.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,9 @@ brew_requires = libmaxminddb
667667
[maxminddb==2.3.0]
668668
apt_requires = libmaxminddb-dev
669669
brew_requires = libmaxminddb
670+
[maxminddb==2.5.2]
671+
apt_requires = libmaxminddb-dev
672+
brew_requires = libmaxminddb
670673

671674
[mccabe==0.6.1]
672675
[mccabe==0.7.0]

0 commit comments

Comments
 (0)