Skip to content

Commit d780c3e

Browse files
committed
Sunset apple-silicon-m1 self-hosted runner, as now is supported by github-hosted runners. Use macos-13 for runs on Intel macs
1 parent db4e736 commit d780c3e

File tree

2 files changed

+6
-31
lines changed

2 files changed

+6
-31
lines changed

.github/workflows/push.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ jobs:
110110
continue-on-error: true
111111
strategy:
112112
matrix:
113-
runs_on: [macos-latest, apple-silicon-m1]
113+
# macos-latest (ATM macos-14) runs on Apple Silicon,
114+
# macos-13 runs on Intel
115+
runs_on: ['macos-latest', 'macos-13']
114116
bootstrap:
115117
- name: sdl2
116118
target: testapps-with-numpy
@@ -126,23 +128,15 @@ jobs:
126128
uses: actions/checkout@v4
127129
- name: Install python-for-android
128130
run: |
129-
source ci/osx_ci.sh
130-
arm64_set_path_and_python_version 3.9.7
131131
python3 -m pip install -e .
132132
- name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
133133
run: |
134-
source ci/osx_ci.sh
135-
arm64_set_path_and_python_version 3.9.7
136134
python3 pythonforandroid/prerequisites.py
137135
- name: Install dependencies (Legacy)
138136
run: |
139-
source ci/osx_ci.sh
140-
arm64_set_path_and_python_version 3.9.7
141137
make --file ci/makefiles/osx.mk
142138
- name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
143139
run: |
144-
source ci/osx_ci.sh
145-
arm64_set_path_and_python_version 3.9.7
146140
make ${{ matrix.bootstrap.target }}
147141
- name: Copy produced artifacts into dist/ (*.apk, *.aab)
148142
run: |
@@ -199,7 +193,9 @@ jobs:
199193
strategy:
200194
matrix:
201195
android_arch: ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
202-
runs_on: [macos-latest, apple-silicon-m1]
196+
# macos-latest (ATM macos-14) runs on Apple Silicon,
197+
# macos-13 runs on Intel
198+
runs_on: ['macos-latest', 'macos-13']
203199
env:
204200
ANDROID_HOME: ${HOME}/.android
205201
ANDROID_SDK_ROOT: ${HOME}/.android/android-sdk
@@ -213,23 +209,15 @@ jobs:
213209
fetch-depth: 0
214210
- name: Install python-for-android
215211
run: |
216-
source ci/osx_ci.sh
217-
arm64_set_path_and_python_version 3.9.7
218212
python3 -m pip install -e .
219213
- name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
220214
run: |
221-
source ci/osx_ci.sh
222-
arm64_set_path_and_python_version 3.9.7
223215
python3 pythonforandroid/prerequisites.py
224216
- name: Install dependencies (Legacy)
225217
run: |
226-
source ci/osx_ci.sh
227-
arm64_set_path_and_python_version 3.9.7
228218
make --file ci/makefiles/osx.mk
229219
- name: Rebuild updated recipes
230220
run: |
231-
source ci/osx_ci.sh
232-
arm64_set_path_and_python_version 3.9.7
233221
make rebuild_updated_recipes
234222
235223
coveralls_finish:

ci/osx_ci.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)