Skip to content

Commit cc8629f

Browse files
committed
update github action files, github actions uses macos-latest for arm64, so change to use macos-13 is for x86_64
1 parent aff74f2 commit cc8629f

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

.github/workflows/C++.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ on:
1313
jobs:
1414
Linux:
1515
runs-on: ubuntu-latest
16-
container: quay.io/pypa/manylinux2014_x86_64:latest
16+
container: quay.io/pypa/manylinux_2_28_x86_64:latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Install fftw
2222
run: |
@@ -29,7 +29,7 @@ jobs:
2929
make test
3030
3131
MacOS_clang:
32-
runs-on: macos-latest
32+
runs-on: macos-13
3333
env:
3434
MACOSX_DEPLOYMENT_TARGET: 10.15
3535

@@ -48,7 +48,7 @@ jobs:
4848
make test
4949
5050
MacOS_gcc:
51-
runs-on: macos-latest
51+
runs-on: macos-13
5252
env:
5353
MACOSX_DEPLOYMENT_TARGET: 10.15
5454

@@ -57,8 +57,8 @@ jobs:
5757

5858
- name: Install gcc and fftw
5959
run: |
60-
brew install gcc@10 fftw
61-
cp make.inc.macosx_gcc-10 make.inc
60+
brew install gcc@12 fftw
61+
cp make.inc.macosx_gcc-12 make.inc
6262
6363
- name: Compile C++ code
6464
run: |

.github/workflows/cmake_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
# may change to cpack and action-gh-release later
7171
- name: Upload static and shared lib
72-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7373
with:
7474
name: ${{matrix.os}}-${{matrix.compiler}}-finufft-lib
7575
path: ${{runner.workspace}}/finufft/build/*finufft*

.github/workflows/python_wheel.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ on:
1313
jobs:
1414
Linux:
1515
runs-on: ubuntu-latest
16-
container: quay.io/pypa/manylinux2014_x86_64:latest
16+
container: quay.io/pypa/manylinux_2_28_x86_64:latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Install fftw
2222
run: |
@@ -31,13 +31,13 @@ jobs:
3131
tools/finufft/build-wheels-linux.sh
3232
3333
- name: Upload wheels
34-
uses: actions/upload-artifact@v3
34+
uses: actions/upload-artifact@v4
3535
with:
3636
name: linux-wheels
3737
path: python/finufft/wheelhouse/finufft*manylinux*.whl
3838

3939
MacOS:
40-
runs-on: macos-latest
40+
runs-on: macos-13
4141
env:
4242
MACOSX_DEPLOYMENT_TARGET: 10.15
4343

@@ -47,18 +47,18 @@ jobs:
4747
- name: Install gcc and fftw
4848
run: |
4949
brew install gcc fftw
50-
cp make.inc.macosx_gcc-8 make.inc
51-
echo "FC=gfortran-11" >> make.inc
52-
echo "CC=gcc-11" >> make.inc
53-
echo "CXX=g++-11" >> make.inc
50+
cp make.inc.macosx_gcc-12 make.inc
51+
echo "FC=gfortran-13" >> make.inc
52+
echo "CC=gcc-13" >> make.inc
53+
echo "CXX=g++-13" >> make.inc
5454
echo "FFLAGS += -march=x86-64" >> make.inc
5555
echo "CFLAGS += -march=x86-64" >> make.inc
5656
echo "CXXFLAGS += -march=x86-64" >> make.inc
5757
# link statically to libgcc, libgfortran and libquadmath
5858
# otherwise binaries are incompatible with older systems
5959
echo "LIBS += -static-libgfortran -static-libgcc -static-libstdc++" >> make.inc
6060
# hack to make libquadmath link statically
61-
sudo rm /usr/local/opt/gcc@11/lib/gcc/11/libquadmath.*dylib
61+
sudo rm /usr/local/opt/gcc@13/lib/gcc/13/libquadmath.*dylib
6262
6363
# Download and install Python instead of using the setup_python
6464
# as the python interpreters in the Github machines
@@ -106,8 +106,8 @@ jobs:
106106
run: |
107107
make lib
108108
export FINUFFT_DIR=`pwd`
109-
export CC=gcc-11
110-
export CXX=g++-11
109+
export CC=gcc-13
110+
export CXX=g++-13
111111
/Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install --upgrade setuptools wheel numpy pip
112112
/Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install -U wheel --user
113113
/Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip wheel python/finufft -w wheelhouse
@@ -171,7 +171,7 @@ jobs:
171171
172172
173173
- name: Upload wheels
174-
uses: actions/upload-artifact@v3
174+
uses: actions/upload-artifact@v4
175175
with:
176176
name: macos-wheels
177177
path: fixed_wheel/*.whl
@@ -186,7 +186,7 @@ jobs:
186186
run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw"
187187

188188
- name: Build and Test Python 3.8
189-
uses: actions/setup-python@v4
189+
uses: actions/setup-python@v5
190190
with:
191191
python-version: '3.8'
192192
architecture: 'x64'
@@ -195,7 +195,7 @@ jobs:
195195
.\.github\workflows\python_test_win.ps1
196196
197197
- name: Build and Test Python 3.9
198-
uses: actions/setup-python@v4
198+
uses: actions/setup-python@v5
199199
with:
200200
python-version: '3.9'
201201
architecture: 'x64'
@@ -204,7 +204,7 @@ jobs:
204204
.\.github\workflows\python_test_win.ps1
205205
206206
- name: Build and Test Python 3.10
207-
uses: actions/setup-python@v4
207+
uses: actions/setup-python@v5
208208
with:
209209
python-version: '3.10'
210210
architecture: 'x64'
@@ -213,7 +213,7 @@ jobs:
213213
.\.github\workflows\python_test_win.ps1
214214
215215
- name: Build and Test Python 3.11
216-
uses: actions/setup-python@v4
216+
uses: actions/setup-python@v5
217217
with:
218218
python-version: '3.11'
219219
architecture: 'x64'
@@ -222,7 +222,7 @@ jobs:
222222
.\.github\workflows\python_test_win.ps1
223223
224224
- name: Build and Test Python 3.12
225-
uses: actions/setup-python@v4
225+
uses: actions/setup-python@v5
226226
with:
227227
python-version: '3.12'
228228
architecture: 'x64'
@@ -231,7 +231,7 @@ jobs:
231231
.\.github\workflows\python_test_win.ps1
232232
233233
- name: Upload wheels
234-
uses: actions/upload-artifact@v3
234+
uses: actions/upload-artifact@v4
235235
with:
236236
name: windows-wheels
237237
path: wheelhouse\*.whl

.github/workflows/python_wheel_macos_arm64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
make lib
3333
3434
- name: Build wheels
35-
uses: pypa/cibuildwheel@v2.16.2
35+
uses: pypa/cibuildwheel@v2.17.0
3636
env:
3737
FINUFFT_DIR: ${{ github.workspace }}
3838
CC: Clang
@@ -44,7 +44,7 @@ jobs:
4444
output-dir: wheelhouse
4545

4646
- name: Upload wheels
47-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4848
with:
4949
name: macos-arm64-wheels
5050
path: wheelhouse/*.whl

0 commit comments

Comments
 (0)