File tree Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -31,14 +31,14 @@ jobs:
3131
3232 linux-wheel :
3333 name : Wheel ${{matrix.image.name}} - Py ${{matrix.python.version}} - ${{matrix.cpu.platform}}
34- runs-on : ubuntu-22.04
34+ runs-on : ubuntu-latest
3535 timeout-minutes : 300
3636
3737 strategy :
3838 fail-fast : false
3939 matrix :
4040 image :
41- - {name: 'manylinux2014 ', py_suffix: ''}
41+ - {name: 'manylinux ', py_suffix: ''}
4242 - {name: 'manylinux_musl', py_suffix: '-alpine'}
4343 python :
4444 - {version: '3.9', spec: 'cp39-cp39'}
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ concurrency:
2929jobs :
3030 check-and-lint :
3131 name : Lint and check code
32- runs-on : ubuntu-20.04
32+ runs-on : ubuntu-latest
3333 steps :
3434 - uses : actions/checkout@v3
3535 - uses : actions/setup-python@v4
4848
4949 unit-tests :
5050 name : Run unit tests for Python ${{matrix.version}}
51- runs-on : ubuntu-22.04
51+ runs-on : ubuntu-latest
5252 timeout-minutes : 120
5353
5454 strategy :
@@ -105,14 +105,14 @@ jobs:
105105 linux-wheel :
106106 name : Wheel ${{matrix.image.name}} - Py ${{matrix.python.version}} - ${{matrix.cpu.platform}}
107107 needs : unit-tests
108- runs-on : ubuntu-22.04
108+ runs-on : ubuntu-latest
109109 timeout-minutes : 300
110110
111111 strategy :
112112 fail-fast : false
113113 matrix :
114114 image :
115- - {name: 'manylinux2014 ', py_suffix: ''}
115+ - {name: 'manylinux ', py_suffix: ''}
116116 - {name: 'manylinux_musl', py_suffix: '-alpine'}
117117 python :
118118 - {version: '3.13', spec: 'cp313-cp313'}
Original file line number Diff line number Diff line change 3131PULSAR_CPP_VERSION=$( cat ./dependencies.yaml | grep pulsar-cpp | awk ' {print $2}' )
3232
3333if [ $CPP_BINARY_TYPE == " rpm" ]; then
34- # The pre-built RPM packages have incompatible ABI with manylinux2014 , so we have to build from source
34+ # The pre-built RPM packages have incompatible ABI with manylinux , so we have to build from source
3535 download_dependency ./dependencies.yaml pulsar-cpp
3636 cd apache-pulsar-client-cpp-${PULSAR_CPP_VERSION}
3737
3838 git clone https://github.com/microsoft/vcpkg.git
3939 cd vcpkg
4040
41- # manylinux2014 does not have ninja in the system package manager
41+ # manylinux does not have ninja in the system package manager
4242 git clone https://github.com/ninja-build/ninja.git
4343 cd ninja
4444 git checkout release
@@ -48,7 +48,7 @@ if [ $CPP_BINARY_TYPE == "rpm" ]; then
4848 ./bootstrap-vcpkg.sh
4949 cd ..
5050 if [ $PULSAR_CPP_VERSION == " 3.7.0" ]; then
51- patch lib/CMakeLists.txt $ROOT_DIR /pkg/manylinux2014 /pulsar-client-cpp-3.7.0.patch
51+ patch lib/CMakeLists.txt $ROOT_DIR /pkg/manylinux /pulsar-client-cpp-3.7.0.patch
5252 fi
5353 cmake -B build-cpp -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DYNAMIC_LIB=ON -DBUILD_STATIC_LIB=ON
5454 cmake --build build-cpp -j8 --target install
Original file line number Diff line number Diff line change 1818#
1919
2020ARG ARCH
21- FROM quay.io/pypa/manylinux2014_ ${ARCH}
21+ FROM quay.io/pypa/manylinux_2_28_ ${ARCH}
2222
2323ARG PYTHON_VERSION
2424ARG PYTHON_SPEC
File renamed without changes.
Original file line number Diff line number Diff line change 1818#
1919
2020ARG ARCH
21- FROM quay.io/pypa/musllinux_1_1_ ${ARCH}
21+ FROM quay.io/pypa/musllinux_1_2_ ${ARCH}
2222
2323ARG PYTHON_VERSION
2424ARG PYTHON_SPEC
You can’t perform that action at this time.
0 commit comments