Skip to content

Commit

Permalink
Try to fix macos arm64 build
Browse files Browse the repository at this point in the history
  • Loading branch information
twizmwazin committed May 21, 2024
1 parent 2a3677f commit b6bd3a2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 20 deletions.
26 changes: 8 additions & 18 deletions .github/workflows/angr-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-2022, macos-12]
os: [ubuntu-22.04, windows-2022, macos-12, macos-14]
needs: create

steps:
Expand Down Expand Up @@ -103,24 +103,9 @@ jobs:
python-version: '3.10'

- name: Download wheels artifact
if: startsWith(matrix.os, 'ubuntu')
uses: actions/download-artifact@v4
with:
name: wheels-ubuntu-22.04
path: wheels

- name: Download wheels artifact
if: startsWith(matrix.os, 'windows')
uses: actions/download-artifact@v4
with:
name: wheels-windows-2022
path: wheels

- name: Download wheels artifact
if: startsWith(matrix.os, 'macos')
uses: actions/download-artifact@v4
with:
name: wheels-macos-12
name: wheels-${{ matrix.os }}
path: wheels

- name: Download ubuntu wheels artifact
Expand Down Expand Up @@ -197,11 +182,16 @@ jobs:
with:
name: wheels-windows-2022
path: dist/wheels-windows-2022
- name: Download macOS wheels artifact
- name: Download macOS x86_64 wheels artifact
uses: actions/download-artifact@v4
with:
name: wheels-macos-12
path: dist/wheels-macos-12
- name: Download macOS arm64 wheels artifact
uses: actions/download-artifact@v4
with:
name: wheels-macos-14
path: dist/wheels-macos-14

- name: Collect all packages to upload
run: find dist \( -name "*.tar.gz" -o -name "*.whl" \) -exec mv {} upload/ \;
Expand Down
2 changes: 0 additions & 2 deletions release-scripts/build_wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ export CIBW_BUILD="
cp310-win_amd64
cp310-macosx_x86_64
cp310-macosx_arm64
cp310-macosx_universal2
"
export CIBW_ARCHS_WINDOWS="AMD64"
export CIBW_ARCHS_MACOS="x86_64 arm64 universal2"
export CIBW_ARCHS_LINUX="x86_64 aarch64"
export CIBW_REPAIR_WHEEL_COMMAND=""
for dist in $(ls); do
Expand Down

0 comments on commit b6bd3a2

Please sign in to comment.