Skip to content

Commit

Permalink
Sunset apple-silicon-m1 self-hosted runner, as now is supported by …
Browse files Browse the repository at this point in the history
…Github Hosted runners via `macos-latest` tag. Use `macos-13` for runs on Intel macs (#103)
  • Loading branch information
misl6 authored Jun 8, 2024
1 parent d48c7b2 commit 36d893e
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/test_macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
runs-on: ${{ matrix.runs_on }}
strategy:
matrix:
runs_on: ['macos-latest', 'apple-silicon-m1']
# macos-latest (ATM macos-14) runs on Apple Silicon,
# macos-13 runs on Intel
runs_on: [macos-latest, macos-13]
name: macOS build dmg ( ${{ matrix.runs_on }} )
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -65,7 +67,9 @@ jobs:
runs-on: ${{ matrix.runs_on }}
strategy:
matrix:
runs_on: ['macos-latest', 'apple-silicon-m1']
# macos-latest (ATM macos-14) runs on Apple Silicon,
# macos-13 runs on Intel
runs_on: [macos-latest, macos-13]
name: macOS test dmg ( ${{ matrix.runs_on }} )
steps:
- uses: actions/checkout@v4
Expand All @@ -74,12 +78,12 @@ jobs:
with:
name: KivySDKPackager
path: osx_artifacts
- name: Mount build from macos-latest runner on apple-silicon-m1 runner
if: ${{ matrix.runs_on == 'apple-silicon-m1' }}
- name: Mount build from macos-latest runner on macos-13 runner
if: ${{ matrix.runs_on == 'macos-13' }}
run: hdiutil attach osx_artifacts/macos-latest-Kivy.dmg -mountroot .
- name: Mount build from apple-silicon-m1n runner on macos-latest runner
if: ${{ matrix.runs_on != 'apple-silicon-m1' }}
run: hdiutil attach osx_artifacts/apple-silicon-m1-Kivy.dmg -mountroot .
- name: Mount build from macos-13 runner on macos-latest runner
if: ${{ matrix.runs_on != 'macos-latest' }}
run: hdiutil attach osx_artifacts/macos-13-Kivy.dmg -mountroot .
- name: Copy Kivy.app to Applications
run: cp -R Kivy/Kivy.app /Applications/Kivy.app
- name: Activate Kivy.app venv and test kivy
Expand Down

0 comments on commit 36d893e

Please sign in to comment.