Skip to content

Commit

Permalink
More slight fixes to arm building
Browse files Browse the repository at this point in the history
  • Loading branch information
rmjarvis committed Jun 10, 2024
1 parent 83a1fbf commit 3d14e85
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# I think yum might always work here. But leave all options available.
CIBW_BEFORE_ALL: yum install -y fftw-devel || apt-get install libfftw3-dev || apk add --upgrade fftw-dev

- uses: actions/upload-artifact@v5
- uses: actions/upload-artifact@v4
with:
name: whl-linux
path: ./wheelhouse/*.whl
Expand All @@ -46,7 +46,7 @@ jobs:
# I think musl always uses apk, but keep all options available.
CIBW_BEFORE_ALL: apk add --upgrade fftw-dev || apt-get install libfftw3-dev || yum install -y fftw-devel

- uses: actions/upload-artifact@v5
- uses: actions/upload-artifact@v4
with:
name: whl-musl
path: ./wheelhouse/*.whl
Expand All @@ -67,7 +67,7 @@ jobs:
CIBW_SKIP: cp36* cp37* pp*
CIBW_BEFORE_ALL: brew install fftw || true

- uses: actions/upload-artifact@v5
- uses: actions/upload-artifact@v4
with:
name: whl-macos
path: ./wheelhouse/*.whl
Expand All @@ -93,9 +93,9 @@ jobs:
LDFLAGS="-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib"
CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
PATH="/opt/homebrew/opt/llvm/bin:$PATH"
FFTW_DIR="/opt/homebrew"
FFTW_DIR="/opt/homebrew/lib"
- uses: actions/upload-artifact@v5
- uses: actions/upload-artifact@v4
with:
name: whl-arm
path: ./wheelhouse/*.whl
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
run: |
python setup.py sdist
ls -l dist
tar tvfz dist/GalSim-*.tar.gz
tar tvfz dist/*.tar.gz
- name: Copy wheels
run: |
Expand Down

0 comments on commit 3d14e85

Please sign in to comment.