Skip to content

Commit

Permalink
Merge branch 'develop' into pi-pico
Browse files Browse the repository at this point in the history
  • Loading branch information
tttapa committed Feb 11, 2024
2 parents 2cbacab + 068c70e commit 4c6b341
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/wheel-short-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
CMAKE_C_COMPILER_LAUNCHER: ccache
CMAKE_CXX_COMPILER_LAUNCHER: ccache
CCACHE_DIR: /tmp/.ccache
MACOSX_DEPLOYMENT_TARGET: '10.9'
MACOSX_DEPLOYMENT_TARGET: '10.15'
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
run: |
source ./py-venv/bin/activate
CMAKE_PREFIX_PATH="$VIRTUAL_ENV:$CMAKE_PREFIX_PATH" \
_PYTHON_HOST_PLATFORM='macosx-10.9-universal2' \
_PYTHON_HOST_PLATFORM='macosx-10.15-universal2' \
ARCHFLAGS='-arch arm64 -arch x86_64' \
python -m build -w .
- name: Upload
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ jobs:
CMAKE_C_COMPILER_LAUNCHER: ccache
CMAKE_CXX_COMPILER_LAUNCHER: ccache
CCACHE_DIR: /tmp/.ccache
MACOSX_DEPLOYMENT_TARGET: '10.9'
MACOSX_DEPLOYMENT_TARGET: '10.15'
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -376,7 +376,7 @@ jobs:
run: |
source ./py-venv/bin/activate
CMAKE_PREFIX_PATH="$VIRTUAL_ENV:$CMAKE_PREFIX_PATH" \
_PYTHON_HOST_PLATFORM='macosx-10.9-universal2' \
_PYTHON_HOST_PLATFORM='macosx-10.15-universal2' \
ARCHFLAGS='-arch arm64 -arch x86_64' \
python -m build -w .
- name: Upload
Expand Down

0 comments on commit 4c6b341

Please sign in to comment.