Skip to content

Commit 363627c

Browse files
authored
[Actions] Fix builds for github-hosted macos-latest. They are now arm64 by default. (See#58)
Self-hosted ones are now removed to prevent collision issues with package names.
1 parent f8327d2 commit 363627c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/python_package.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
17-
os: ['ubuntu-20.04', 'macos-latest', 'windows-latest', 'linux-arm64', 'macos-arm64']
17+
os: ['ubuntu-20.04', 'macos-latest', 'windows-latest', 'linux-arm64']
1818
experimental: [false]
1919
# exclude:
2020
# excludes python-version 3.7 on macOS-arm64 (Not available via brew)
@@ -28,12 +28,12 @@ jobs:
2828
git submodule update --init --recursive
2929
git fetch --prune --unshallow
3030
- name: Set up Python ${{ matrix.python-version }} (Github Hosted VMs)
31-
if: matrix.os != 'linux-arm64' && matrix.os != 'macos-arm64'
31+
if: matrix.os != 'linux-arm64'
3232
uses: actions/setup-python@v2
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Set up Python ${{ matrix.python-version }} (Self Hosted Vms)
36-
if: matrix.os == 'linux-arm64' || matrix.os == 'macos-arm64'
36+
if: matrix.os == 'linux-arm64'
3737
run: |
3838
python${{ matrix.python-version }} -m venv venv${{ matrix.python-version }}
3939
echo "${{github.workspace}}/venv${{matrix.python-version}}/bin/" >> $GITHUB_PATH
@@ -82,7 +82,7 @@ jobs:
8282
sw_vers
8383
rename 's/11_0/10_14/' *
8484
rename 's/12_0/10_15/' *
85-
rename 's/universal2/x86_64/' *
85+
rename 's/universal2/arm64/' *
8686
cd ..
8787
- name: Install (not Windows)
8888
if: matrix.os != 'windows-latest'
@@ -95,7 +95,7 @@ jobs:
9595
python tests/print_platform_info.py
9696
python -m pip install @(join-path "dist" (get-childitem -path dist -name *.whl))
9797
- name: Remove old quadprog folder (self-hosted)
98-
if: matrix.os == 'linux-arm64' || matrix.os == 'macos-arm64'
98+
if: matrix.os == 'linux-arm64'
9999
run: |
100100
cd tests
101101
python -m pip uninstall quadprog -y

0 commit comments

Comments
 (0)