Skip to content

Commit

Permalink
Merge pull request #25 from espressif/feat/project_cleanup
Browse files Browse the repository at this point in the history
Project cleanup, Manual build and upload
  • Loading branch information
dobairoland authored Jan 23, 2024
2 parents 79e895a + 802a865 commit 0090a6e
Show file tree
Hide file tree
Showing 18 changed files with 65 additions and 1,301 deletions.
60 changes: 45 additions & 15 deletions .github/workflows/build-wheels-defined.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
if: ${{ inputs.os_ubuntu_latest }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
Expand All @@ -56,7 +57,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version}}
python-version: ${{ matrix.python-version}}

- name: Get Python version
run: |
Expand Down Expand Up @@ -85,6 +86,7 @@ jobs:
if: ${{ inputs.os_windows_latest }}
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
Expand All @@ -94,7 +96,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version}}
python-version: ${{ matrix.python-version}}

- name: Get Python version
run: |
Expand All @@ -120,6 +122,7 @@ jobs:
if: ${{ inputs.os_macos_latest }}
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
Expand All @@ -129,7 +132,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version}}
python-version: ${{ matrix.python-version}}

- name: Get Python version
run: |
Expand Down Expand Up @@ -158,18 +161,27 @@ jobs:
if: ${{ inputs.os_macos_arm64 }}
runs-on: macos-latest-xlarge # MacOS M1 GitHub beta runner - paid $0.16
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Python
# Temporary solution until Python version for build will be >= 3.10 (GitHub action support)
if: matrix.python-version == '3.12'
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Setup Python - MacOS M1
# Temporary solution until Python version for build will be >= 3.10 (GitHub action support)
if: matrix.python-version != '3.12'
run: |
brew install python@${{ matrix.python_version }}
brew install python@${{ matrix.python-version }}
# change python symlink called with default command 'python'
ln -s -f /opt/homebrew/bin/python${{ matrix.python_version }} /usr/local/bin/python
ln -s -f /opt/homebrew/bin/python${{ matrix.python-version }} /usr/local/bin/python
- name: Get Python version
run: |
Expand Down Expand Up @@ -198,17 +210,25 @@ jobs:
if: ${{ inputs.os_linux_armv7 }}
runs-on: linux-armv7-self-hosted
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
include:
- python-version: '3.8'
CONTAINER: 'python:3.8-bullseye'
- python-version: '3.9'
CONTAINER: 'python:3.9-bullseye'
- python-version: '3.10'
CONTAINER: 'python:3.10-bullseye'
- python-version: '3.11'
CONTAINER: 'python:3.11-bullseye'
- python-version: '3.12'
CONTAINER: 'python:3.12-bullseye'
container: ${{ matrix.CONTAINER }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version}}

- name: Get Python version
run: |
python --version
Expand Down Expand Up @@ -239,17 +259,25 @@ jobs:
if: ${{ inputs.os_linux_arm64 }}
runs-on: linux-arm64-self-hosted
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
include:
- python-version: '3.8'
CONTAINER: 'python:3.8-bullseye'
- python-version: '3.9'
CONTAINER: 'python:3.9-bullseye'
- python-version: '3.10'
CONTAINER: 'python:3.10-bullseye'
- python-version: '3.11'
CONTAINER: 'python:3.11-bullseye'
- python-version: '3.12'
CONTAINER: 'python:3.12-bullseye'
container: ${{ matrix.CONTAINER }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version}}

- name: Get Python version
run: |
python --version
Expand All @@ -273,6 +301,8 @@ jobs:


upload-python-wheels:
if: ${{ always() }}
needs: [ubuntu-latest, windows-latest, macos-latest, macos-m1, linux-armv7, linux-arm64]
name: Upload Python wheels
uses: espressif/idf-python-wheels/.github/workflows/upload-python-wheels.yml@main
secrets: inherit
127 changes: 0 additions & 127 deletions .github/workflows/build-wheels-linux-arm64-self-hosted.yml

This file was deleted.

Loading

0 comments on commit 0090a6e

Please sign in to comment.