Sunset apple-silicon-m1 self-hosted runner, as now is supported by gi…

…thub-hosted runners. Use macos-13 for runs on Intel macs
misl6 · May 4, 2024 · 8879f4b · 8879f4b
1 parent db4e736
commit 8879f4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 32 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -110,7 +110,9 @@ jobs:
     continue-on-error: true
     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']
         bootstrap:
           - name: sdl2
             target: testapps-with-numpy
@@ -126,23 +128,15 @@ jobs:
         uses: actions/checkout@v4
       - name: Install python-for-android
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 -m pip install -e .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 pythonforandroid/prerequisites.py
       - name: Install dependencies (Legacy)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make --file ci/makefiles/osx.mk
       - name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make ${{ matrix.bootstrap.target }}
       - name: Copy produced artifacts into dist/ (*.apk, *.aab)
         run: |
@@ -199,7 +193,9 @@ jobs:
     strategy:
       matrix:
         android_arch: ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
-        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']
     env:
       ANDROID_HOME: ${HOME}/.android
       ANDROID_SDK_ROOT: ${HOME}/.android/android-sdk
@@ -213,23 +209,15 @@ jobs:
           fetch-depth: 0
       - name: Install python-for-android
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 -m pip install -e .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 pythonforandroid/prerequisites.py
       - name: Install dependencies (Legacy)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make --file ci/makefiles/osx.mk
       - name: Rebuild updated recipes
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make rebuild_updated_recipes
 
   coveralls_finish:

diff --git a/ci/osx_ci.sh b/ci/osx_ci.sh
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -32,7 +32,7 @@ class KivyRecipe(CythonRecipe):
     # sdl-gl-swapwindow-nogil.patch is needed to avoid a deadlock.
     # See: https://github.com/kivy/kivy/pull/8025
     # WARNING: Remove this patch when a new Kivy version is released.
-    patches = [("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue)]
+    patches = [("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue), 'patch-pr-ellipse-use-indexed-triangles.patch']
 
     def cythonize_build(self, env, build_dir='.'):
         super().cythonize_build(env, build_dir=build_dir)