Now Github Actions provides python3 via setup-python also for Apple S…

…ilicon Macs
kivy · Oct 5, 2023 · f95bcff · f95bcff
1 parent 9d66904
commit f95bcff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 33 deletions.
diff --git a/.ci/osx_ci.sh b/.ci/osx_ci.sh
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -9,43 +9,37 @@ jobs:
     runs-on: ${{ matrix.runs_on }}
     strategy:
       matrix:
-        include:
-          - runs_on: macos-latest
+        runs_on:
+          - macos-latest
+          - apple-silicon-m1
+        python:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+        exclude:
+          - runs_on: apple-silicon-m1
             python: "3.7"
-          - runs_on: macos-latest
+          - runs_on: apple-silicon-m1
             python: "3.8"
-          - runs_on: macos-latest
-            python: "3.9"
-          - runs_on: macos-latest
-            python: "3.10"
-          - runs_on: macos-latest
-            python: "3.11"
           - runs_on: apple-silicon-m1
             python: "3.9"
-          - runs_on: apple-silicon-m1
-            python: "3.10"
-          - runs_on: apple-silicon-m1
-            python: "3.11"
     steps:
     - uses: actions/checkout@v2
+
     - name: Set up Python ${{ matrix.python }}
-      # Needs to be skipped on our self-hosted runners tagged as 'apple-silicon-m1'
-      if: ${{ matrix.runs_on  != 'apple-silicon-m1' }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
 
     - name: Install project
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         pip install cython pytest
         pip install .
 
     - name: Test with pytest
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         make test_lib
         make
         make tests