diff --git a/.github/workflows/pythonpublish-linux.yml b/.github/workflows/pythonpublish-linux.yml index faa6f638..04d124bc 100644 --- a/.github/workflows/pythonpublish-linux.yml +++ b/.github/workflows/pythonpublish-linux.yml @@ -17,13 +17,7 @@ jobs: - cp312-cp312 runs-on: ubuntu-latest - container: quay.io/pypa/manylinux2014_x86_64 - - # node20 can't run on manylinux2014 as it requires newer version of GLIBC - # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ - env: - ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + container: quay.io/pypa/manylinux_2_28_x86_64 steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 @@ -33,9 +27,9 @@ jobs: run: | echo "/opt/python/${{ matrix.python-version }}/bin" >> $GITHUB_PATH - name: Install dependencies - run: .github/workflows/scripts/install_req_centos.sh + run: .github/workflows/scripts/install_req_manylinux.sh - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: .github/workflows/scripts/release_centos.sh + run: .github/workflows/scripts/release_manylinux.sh diff --git a/.github/workflows/scripts/install_req_centos.sh b/.github/workflows/scripts/install_req_centos.sh deleted file mode 100755 index 6be730b7..00000000 --- a/.github/workflows/scripts/install_req_centos.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -yum makecache -y -yum install centos-release-scl -y -yum-config-manager --enable rhel-server-rhscl-7-rpms -yum install llvm-toolset-7.0 python3 python3-devel -y -scl enable llvm-toolset-7.0 bash -export CC=/opt/rh/llvm-toolset-7.0/root/usr/bin/clang -export CPP=/opt/rh/llvm-toolset-7.0/root/usr/bin/clang-cpp -export CXX=/opt/rh/llvm-toolset-7.0/root/usr/bin/clang++ -export PATH=/opt/rh/llvm-toolset-7.0/root/usr/bin:/opt/rh/llvm-toolset-7.0/root/usr/sbin${PATH:+:${PATH}} -export LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7.0/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - -clang --version - - -# install python dependencies -python3 -m pip install --upgrade pip -python3 -m pip install setuptools wheel twine auditwheel diff --git a/.github/workflows/scripts/install_req_manylinux.sh b/.github/workflows/scripts/install_req_manylinux.sh new file mode 100755 index 00000000..38821c20 --- /dev/null +++ b/.github/workflows/scripts/install_req_manylinux.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +# install python dependencies +python3 -m pip install --upgrade pip +python3 -m pip install setuptools wheel twine auditwheel diff --git a/.github/workflows/scripts/release_centos.sh b/.github/workflows/scripts/release_centos.sh deleted file mode 100755 index 60382811..00000000 --- a/.github/workflows/scripts/release_centos.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -export CC=/opt/rh/llvm-toolset-7.0/root/usr/bin/clang -export CPP=/opt/rh/llvm-toolset-7.0/root/usr/bin/clang-cpp -export CXX=/opt/rh/llvm-toolset-7.0/root/usr/bin/clang++ -export PATH=/opt/rh/llvm-toolset-7.0/root/usr/bin:/opt/rh/llvm-toolset-7.0/root/usr/sbin${PATH:+:${PATH}} -export LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7.0/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - -python3 -m pip wheel . -w dist/ --no-deps -auditwheel repair dist/*.whl --plat $AUDITWHEEL_PLAT -twine upload --skip-existing wheelhouse/* diff --git a/.github/workflows/scripts/release_manylinux.sh b/.github/workflows/scripts/release_manylinux.sh new file mode 100755 index 00000000..69bae111 --- /dev/null +++ b/.github/workflows/scripts/release_manylinux.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +python3 -m pip wheel . -w dist/ --no-deps +auditwheel repair dist/*.whl --plat $AUDITWHEEL_PLAT +twine upload --skip-existing wheelhouse/*