From cc8629f78d8aa764b32d15a6d5fd40901e408e4d Mon Sep 17 00:00:00 2001 From: Libin Lu Date: Fri, 26 Apr 2024 17:31:45 -0400 Subject: [PATCH] update github action files, github actions uses macos-latest for arm64, so change to use macos-13 is for x86_64 --- .github/workflows/C++.yml | 12 +++---- .github/workflows/cmake_ci.yml | 2 +- .github/workflows/python_wheel.yml | 36 +++++++++---------- .../workflows/python_wheel_macos_arm64.yml | 4 +-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/C++.yml b/.github/workflows/C++.yml index 5a16fc82f..6c16c9507 100644 --- a/.github/workflows/C++.yml +++ b/.github/workflows/C++.yml @@ -13,10 +13,10 @@ on: jobs: Linux: runs-on: ubuntu-latest - container: quay.io/pypa/manylinux2014_x86_64:latest + container: quay.io/pypa/manylinux_2_28_x86_64:latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install fftw run: | @@ -29,7 +29,7 @@ jobs: make test MacOS_clang: - runs-on: macos-latest + runs-on: macos-13 env: MACOSX_DEPLOYMENT_TARGET: 10.15 @@ -48,7 +48,7 @@ jobs: make test MacOS_gcc: - runs-on: macos-latest + runs-on: macos-13 env: MACOSX_DEPLOYMENT_TARGET: 10.15 @@ -57,8 +57,8 @@ jobs: - name: Install gcc and fftw run: | - brew install gcc@10 fftw - cp make.inc.macosx_gcc-10 make.inc + brew install gcc@12 fftw + cp make.inc.macosx_gcc-12 make.inc - name: Compile C++ code run: | diff --git a/.github/workflows/cmake_ci.yml b/.github/workflows/cmake_ci.yml index a91f8e9b9..ed92e1cd5 100644 --- a/.github/workflows/cmake_ci.yml +++ b/.github/workflows/cmake_ci.yml @@ -69,7 +69,7 @@ jobs: # may change to cpack and action-gh-release later - name: Upload static and shared lib - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{matrix.os}}-${{matrix.compiler}}-finufft-lib path: ${{runner.workspace}}/finufft/build/*finufft* diff --git a/.github/workflows/python_wheel.yml b/.github/workflows/python_wheel.yml index 5f88ac3c9..5a84dd5a9 100644 --- a/.github/workflows/python_wheel.yml +++ b/.github/workflows/python_wheel.yml @@ -13,10 +13,10 @@ on: jobs: Linux: runs-on: ubuntu-latest - container: quay.io/pypa/manylinux2014_x86_64:latest + container: quay.io/pypa/manylinux_2_28_x86_64:latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install fftw run: | @@ -31,13 +31,13 @@ jobs: tools/finufft/build-wheels-linux.sh - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux-wheels path: python/finufft/wheelhouse/finufft*manylinux*.whl MacOS: - runs-on: macos-latest + runs-on: macos-13 env: MACOSX_DEPLOYMENT_TARGET: 10.15 @@ -47,10 +47,10 @@ jobs: - name: Install gcc and fftw run: | brew install gcc fftw - cp make.inc.macosx_gcc-8 make.inc - echo "FC=gfortran-11" >> make.inc - echo "CC=gcc-11" >> make.inc - echo "CXX=g++-11" >> make.inc + cp make.inc.macosx_gcc-12 make.inc + echo "FC=gfortran-13" >> make.inc + echo "CC=gcc-13" >> make.inc + echo "CXX=g++-13" >> make.inc echo "FFLAGS += -march=x86-64" >> make.inc echo "CFLAGS += -march=x86-64" >> make.inc echo "CXXFLAGS += -march=x86-64" >> make.inc @@ -58,7 +58,7 @@ jobs: # otherwise binaries are incompatible with older systems echo "LIBS += -static-libgfortran -static-libgcc -static-libstdc++" >> make.inc # hack to make libquadmath link statically - sudo rm /usr/local/opt/gcc@11/lib/gcc/11/libquadmath.*dylib + sudo rm /usr/local/opt/gcc@13/lib/gcc/13/libquadmath.*dylib # Download and install Python instead of using the setup_python # as the python interpreters in the Github machines @@ -106,8 +106,8 @@ jobs: run: | make lib export FINUFFT_DIR=`pwd` - export CC=gcc-11 - export CXX=g++-11 + export CC=gcc-13 + export CXX=g++-13 /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install --upgrade setuptools wheel numpy pip /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install -U wheel --user /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip wheel python/finufft -w wheelhouse @@ -171,7 +171,7 @@ jobs: - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos-wheels path: fixed_wheel/*.whl @@ -186,7 +186,7 @@ jobs: run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw" - name: Build and Test Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.8' architecture: 'x64' @@ -195,7 +195,7 @@ jobs: .\.github\workflows\python_test_win.ps1 - name: Build and Test Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' @@ -204,7 +204,7 @@ jobs: .\.github\workflows\python_test_win.ps1 - name: Build and Test Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' architecture: 'x64' @@ -213,7 +213,7 @@ jobs: .\.github\workflows\python_test_win.ps1 - name: Build and Test Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' architecture: 'x64' @@ -222,7 +222,7 @@ jobs: .\.github\workflows\python_test_win.ps1 - name: Build and Test Python 3.12 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.12' architecture: 'x64' @@ -231,7 +231,7 @@ jobs: .\.github\workflows\python_test_win.ps1 - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: windows-wheels path: wheelhouse\*.whl diff --git a/.github/workflows/python_wheel_macos_arm64.yml b/.github/workflows/python_wheel_macos_arm64.yml index 54d9653cc..4bde22f3e 100644 --- a/.github/workflows/python_wheel_macos_arm64.yml +++ b/.github/workflows/python_wheel_macos_arm64.yml @@ -32,7 +32,7 @@ jobs: make lib - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 env: FINUFFT_DIR: ${{ github.workspace }} CC: Clang @@ -44,7 +44,7 @@ jobs: output-dir: wheelhouse - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos-arm64-wheels path: wheelhouse/*.whl