Skip to content

Commit 03af3a9

Browse files
committed
Upgrade from deprecated macos-13 to macos-15-intel in CI
Upgrade from deprecated `macos-13` GitHub Actions runner to `macos-15-intel`. The currently available GitHub Actions macOS runners are: | macOS Version | runner.arch | |---------------|-------------| | macos-13 | X64 | | macos-14 | ARM64 | | macos-15 | ARM64 | | macos-15-intel | X64 | | macos-26 | ARM64 | | macos-latest | ARM64 | * Let's prepare for actions/runner-images#13046 * Like: kivy/kivy#9162 Should a set of test runs be made on `macos-26`?
1 parent 8ca6eba commit 03af3a9

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
matrix:
1111
os:
1212
- 'ubuntu-latest'
13-
- 'macOs-latest'
13+
- 'macos-latest'
1414
runs-on: ${{ matrix.os }}
1515
steps:
16-
- name: Setup python
16+
- name: Setup Python
1717
uses: actions/setup-python@v6
1818
with:
1919
python-version: '3.x'
@@ -28,14 +28,14 @@ jobs:
2828
pip install .
2929
- run: buildozer --help
3030
- run: buildozer init
31-
- name: SDK, NDK and p4a download
31+
- name: SDK, NDK, and p4a download
3232
run: |
3333
sed -i.bak "s/# android.accept_sdk_license = False/android.accept_sdk_license = True/" buildozer.spec
3434
sed -i.bak "s/#p4a.branch = master/p4a.branch = develop/" buildozer.spec
3535
buildozer android p4a -- --help
3636
# Install OS specific dependencies
3737
- name: Install Linux dependencies
38-
if: matrix.os == 'ubuntu-latest'
38+
if: runner.os == 'Linux'
3939
# Required by some p4a recipes, but not
4040
# installed by p4a on Linux.
4141
run: |

.github/workflows/ios.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ jobs:
55
name: "Integration (${{ matrix.runs_on }}, ${{ matrix.python }})"
66
runs-on: ${{ matrix.runs_on }}
77
strategy:
8+
fail-fast: false
89
matrix:
9-
# macos-latest (ATM macos-15) runs on Apple Silicon,
10-
# macos-13 runs on Intel
11-
runs_on: [macos-latest, macos-13]
10+
# macos-15-intel runs on Intel.
11+
# All others run on Apple Silicon (ARM)
12+
runs_on: [macos-14, macos-latest, macos-26, macos-15-intel]
13+
python: [3.x]
1214
steps:
13-
- name: Setup python
15+
- name: "Setup Python ${{ matrix.python }} on ${{ matrix.runs_on }} (${{ runner.arch }})"
1416
uses: actions/setup-python@v6
1517
with:
1618
python-version: '3.x'
@@ -27,6 +29,10 @@ jobs:
2729
- name: Install dependencies
2830
run: |
2931
brew install autoconf automake libtool pkg-config
32+
- name: Install Metal Toolchain on macOS 26
33+
if: matrix.runs_on == 'macos-26' # actions/runner-images#13080
34+
run: |
35+
sudo xcodebuild -downloadComponent MetalToolchain
3036
- name: buildozer ios debug
3137
run: |
3238
touch main.py

0 commit comments

Comments
 (0)