Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Now Github Actions provides python3 via setup-python also for Apple Silicon macs #829

Merged
merged 1 commit into from
Jul 18, 2023
Merged

Now Github Actions provides python3 via setup-python also for Apple Silicon macs #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .ci/utils.sh
View file
Open in desktop

This file was deleted.

52 changes: 6 additions & 46 deletions .github/workflows/kivy_ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,16 @@ jobs:
runs-on: ${{ matrix.runs_on }}
strategy:
matrix:
include:
- runs_on: macos-latest
python: 3.x
- runs_on: apple-silicon-m1
python: '3.11'
runs_on: [macos-latest, apple-silicon-m1]
steps:
- name: Checkout kivy-ios
uses: actions/checkout@v3
- name: Set up Python 3.x
# 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'
- name: Install requirements
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
brew install libjpeg
pip3 install wheel
pip3 install -r requirements.txt
Expand All @@ -50,13 +42,9 @@ jobs:
sudo gem install xcpretty
- name: Install kivy-ios
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
python setup.py install
- name: Build Python & Kivy
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
toolchain build python3 kivy
- name: Checkout kivy for tests apps
uses: actions/checkout@v3
Expand All @@ -65,32 +53,22 @@ jobs:
path: kivy-ci-clone
- name: Create & Build test project
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
.ci/test_project.sh

build_python3_kivy_venv:
runs-on: ${{ matrix.runs_on }}
strategy:
matrix:
include:
- runs_on: macos-latest
python: 3.x
- runs_on: apple-silicon-m1
python: '3.11'
runs_on: [macos-latest, apple-silicon-m1]
steps:
- name: Checkout kivy-ios
uses: actions/checkout@v3
- name: Set up Python 3.x
# 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'
- name: Install requirements
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
python -m venv venv
. venv/bin/activate
brew install libjpeg
Expand All @@ -103,13 +81,9 @@ jobs:
sudo gem install xcpretty
- name: Install kivy-ios
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
python setup.py install
- name: Build Python & Kivy
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
. venv/bin/activate
toolchain build python3 kivy
- name: Checkout kivy for tests apps
Expand All @@ -119,8 +93,6 @@ jobs:
path: kivy-ci-clone
- name: Create & Build test project
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
. venv/bin/activate
.ci/test_project.sh

Expand All @@ -129,24 +101,16 @@ jobs:
runs-on: ${{ matrix.runs_on }}
strategy:
matrix:
include:
- runs_on: macos-latest
python: 3.x
- runs_on: apple-silicon-m1
python: '3.11'
runs_on: [macos-latest, apple-silicon-m1]
steps:
- name: Checkout kivy-ios
uses: actions/checkout@v3
- name: Set up Python 3.x
# 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'
- name: Install requirements
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
brew install libjpeg
pip3 install wheel
pip3 install -r requirements.txt
Expand All @@ -155,11 +119,7 @@ jobs:
pip3 install Cython==0.29.33
- name: Install kivy-ios
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
python setup.py install
- name: Build updated recipes
run: |
source .ci/utils.sh
arm64_set_path_and_python_version ${{ matrix.python }}
python3 .ci/rebuild_updated_recipes.py