Skip to content

Bump manylinux versions for CVEs #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merlimat merged 3 commits into from
Apr 22, 2025
Merged

Bump manylinux versions for CVEs #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
333da6f
Bump manylinux versions for CVEs
BewareMyPower Apr 22, 2025
3bb9d78
Use ubuntu-latest runner
BewareMyPower Apr 22, 2025
34a61dc
Fix build script
BewareMyPower Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-build-release-wheels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ jobs:

linux-wheel:
name: Wheel ${{matrix.image.name}} - Py ${{matrix.python.version}} - ${{matrix.cpu.platform}}
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 300

strategy:
fail-fast: false
matrix:
image:
- {name: 'manylinux2014', py_suffix: ''}
- {name: 'manylinux', py_suffix: ''}
- {name: 'manylinux_musl', py_suffix: '-alpine'}
python:
- {version: '3.9', spec: 'cp39-cp39'}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-pr-validation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ concurrency:
jobs:
check-and-lint:
name: Lint and check code
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand All @@ -48,7 +48,7 @@ jobs:

unit-tests:
name: Run unit tests for Python ${{matrix.version}}
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 120

strategy:
Expand Down Expand Up @@ -105,14 +105,14 @@ jobs:
linux-wheel:
name: Wheel ${{matrix.image.name}} - Py ${{matrix.python.version}} - ${{matrix.cpu.platform}}
needs: unit-tests
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 300

strategy:
fail-fast: false
matrix:
image:
- {name: 'manylinux2014', py_suffix: ''}
- {name: 'manylinux', py_suffix: ''}
- {name: 'manylinux_musl', py_suffix: '-alpine'}
python:
- {version: '3.13', spec: 'cp313-cp313'}
Expand Down
6 changes: 3 additions & 3 deletions pkg/build-wheel-inside-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ fi
PULSAR_CPP_VERSION=$(cat ./dependencies.yaml | grep pulsar-cpp | awk '{print $2}')

if [ $CPP_BINARY_TYPE == "rpm" ]; then
# The pre-built RPM packages have incompatible ABI with manylinux2014, so we have to build from source
# The pre-built RPM packages have incompatible ABI with manylinux, so we have to build from source
download_dependency ./dependencies.yaml pulsar-cpp
cd apache-pulsar-client-cpp-${PULSAR_CPP_VERSION}

git clone https://github.com/microsoft/vcpkg.git
cd vcpkg

# manylinux2014 does not have ninja in the system package manager
# manylinux does not have ninja in the system package manager
git clone https://github.com/ninja-build/ninja.git
cd ninja
git checkout release
Expand All @@ -48,7 +48,7 @@ if [ $CPP_BINARY_TYPE == "rpm" ]; then
./bootstrap-vcpkg.sh
cd ..
if [ $PULSAR_CPP_VERSION == "3.7.0" ]; then
patch lib/CMakeLists.txt $ROOT_DIR/pkg/manylinux2014/pulsar-client-cpp-3.7.0.patch
patch lib/CMakeLists.txt $ROOT_DIR/pkg/manylinux/pulsar-client-cpp-3.7.0.patch
fi
cmake -B build-cpp -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DYNAMIC_LIB=ON -DBUILD_STATIC_LIB=ON
cmake --build build-cpp -j8 --target install
Expand Down
2 changes: 1 addition & 1 deletion pkg/manylinux2014/Dockerfile → pkg/manylinux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

ARG ARCH
FROM quay.io/pypa/manylinux2014_${ARCH}
FROM quay.io/pypa/manylinux_2_28_${ARCH}

ARG PYTHON_VERSION
ARG PYTHON_SPEC
Expand Down
0 ...nylinux2014/pulsar-client-cpp-3.7.0.patch → pkg/manylinux/pulsar-client-cpp-3.7.0.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/manylinux_musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

ARG ARCH
FROM quay.io/pypa/musllinux_1_1_${ARCH}
FROM quay.io/pypa/musllinux_1_2_${ARCH}

ARG PYTHON_VERSION
ARG PYTHON_SPEC
Expand Down