From f8b0bbd38629a692257cdb540c04b6b6679ee0b3 Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Sun, 10 Sep 2023 10:43:49 +0200
Subject: [PATCH] Now Github Actions provides python3 via setup-python also for
 Apple Silicon macs

---
 .ci/osx_ci.sh             | 13 -------------
 .github/workflows/ios.yml | 22 +++-------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 .ci/osx_ci.sh

diff --git a/.ci/osx_ci.sh b/.ci/osx_ci.sh
deleted file mode 100644
index 8cdd1ac1a..000000000
--- a/.ci/osx_ci.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e -x
-
-arm64_set_path_and_python_version(){
-  python_version="$1"
-  if [[ $(/usr/bin/arch) = arm64 ]]; then
-      export PATH=/opt/homebrew/bin:$PATH
-      eval "$(pyenv init --path)"
-      pyenv install $python_version -s
-      pyenv global $python_version
-      export PATH=$(pyenv prefix)/bin:$PATH
-  fi
-}
\ No newline at end of file
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 9601c7c75..a9c7e97fc 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -3,46 +3,30 @@ name: iOS
 jobs:
   Integration:
     name: "Integration (${{ matrix.runs_on }}, ${{ matrix.python }})"
-    runs-on: ${{ matrix.runs_on || 'macos-latest' }}
+    runs-on: ${{ matrix.runs_on }}
     strategy:
       matrix:
-        include:
-          - runs_on: macos-latest
-            python: '3.9'
-          - runs_on: apple-silicon-m1
-            python: '3.9.7'
+        runs_on: [macos-latest, apple-silicon-m1]
     steps:
     - name: Setup 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@v4
       with:
-        python-version: ${{ matrix.python }}
+        python-version: '3.x'
     - uses: actions/checkout@v4
     - name: Setup environment
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         pip install -e .
         pip install Cython==0.29.36 cookiecutter pbxproj
     - name: Check buildozer installation
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         buildozer --help
     - name: Initialize buildozer in project folder
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         buildozer init
     - name: Install dependencies
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         brew install autoconf automake libtool pkg-config
     - name: buildozer ios debug
       run: |
-        source .ci/osx_ci.sh
-        arm64_set_path_and_python_version ${{ matrix.python }}
         touch main.py
         buildozer ios debug