Skip to content

Commit 73ff486

Browse files
authored
update versions and also trigger re-build for python 3.14 (#346)
update builder image: - base image updates, e.g. python 3.14 - boost 1.88.0 - cmake 3.31.8 - ccache 4.11.3
1 parent 74065df commit 73ff486

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

.github/workflows/python-dockerimages-cibuildwheel.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,39 @@ on:
1515

1616
jobs:
1717
build_docker:
18-
runs-on: ubuntu-latest
18+
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
2121
base_image: [many, musl]
22-
arch: [x86_64, aarch64]
22+
os: [ubuntu-24.04, ubuntu-24.04-arm]
2323
steps:
2424
- uses: actions/checkout@v4
25-
- name: Set up QEMU
26-
if: ${{ matrix.arch == 'aarch64' }}
27-
uses: docker/setup-qemu-action@v3
28-
with:
29-
platforms: all
3025
- uses: docker/setup-buildx-action@v3
3126
- name: Log in to Docker Hub
3227
if: github.event_name == 'push'
3328
uses: docker/login-action@v3
3429
with:
3530
username: ${{ secrets.DOCKER_USER }}
3631
password: ${{ secrets.DOCKER_TOKEN }}
37-
- name: Sets platform for arm64
32+
- name: Sets platform/arch for arm64
3833
run: |
3934
echo "PLATFORM=linux/arm64" >> $GITHUB_ENV
40-
if: matrix.arch == 'aarch64'
41-
- name: Sets platform for amd64
35+
echo "ARCH=aarch64" >> $GITHUB_ENV
36+
if: matrix.os == 'ubuntu-24.04-arm'
37+
- name: Sets platform/arch for amd64
4238
run: |
4339
echo "PLATFORM=linux/amd64" >> $GITHUB_ENV
44-
if: matrix.arch == 'x86_64'
40+
echo "ARCH=x86_64" >> $GITHUB_ENV
41+
if: matrix.os == 'ubuntu-24.04'
4542
- name: Sets env for manylinux
4643
run: |
47-
echo "BASE_IMAGE=quay.io/pypa/manylinux_2_28_${{ matrix.arch }}" >> $GITHUB_ENV
44+
echo "BASE_IMAGE=quay.io/pypa/manylinux_2_28_${{ env.ARCH }}" >> $GITHUB_ENV
4845
if: matrix.base_image == 'many'
4946
- name: Sets env for musllinux
5047
run: |
51-
echo "BASE_IMAGE=quay.io/pypa/musllinux_1_1_${{ matrix.arch }}" >> $GITHUB_ENV
48+
echo "BASE_IMAGE=quay.io/pypa/musllinux_1_1_${{ env.ARCH }}" >> $GITHUB_ENV
5249
if: matrix.base_image == 'musl'
53-
- name: Build and push ${{ matrix.base_image }}-${{ matrix.arch }} docker image
50+
- name: Build and push ${{ matrix.base_image }}-${{ env.ARCH }} docker image
5451
uses: docker/build-push-action@v6
5552
with:
5653
context: docker/manylinux-builder
@@ -60,4 +57,4 @@ jobs:
6057
push: ${{ github.event_name == 'push' }}
6158
build-args: |
6259
base_image=${{ env.BASE_IMAGE }}
63-
tags: keyvidev/${{ matrix.base_image }}linux-builder-${{ matrix.arch }}
60+
tags: keyvidev/${{ matrix.base_image }}linux-builder-${{ env.ARCH }}

docker/manylinux-builder/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN curl https://zlib.net/zlib-${ZLIB_MAJOR}.${ZLIB_MINOR}.${ZLIB_PATCH}.tar.gz
2222
cd zlib-${ZLIB_MAJOR}.${ZLIB_MINOR}.${ZLIB_PATCH} && ./configure && make -j`nproc` && make install && \
2323
cd .. && rm -rf zlib-${ZLIB_MAJOR}.${ZLIB_MINOR}.${ZLIB_PATCH} zlib-${ZLIB_MAJOR}.${ZLIB_MINOR}.${ZLIB_PATCH}.tar.gz
2424

25-
ENV BOOST_MAJOR=1 BOOST_MINOR=83 BOOST_PATCH=0
25+
ENV BOOST_MAJOR=1 BOOST_MINOR=88 BOOST_PATCH=0
2626
ENV BOOST_URL="https://boostorg.jfrog.io/artifactory/main/release/${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/source/boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.gz"
2727
ENV BOOST_FALLBACK_URL="https://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.gz"
2828

@@ -35,13 +35,13 @@ RUN cd boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH} && \
3535
cd .. && \
3636
rm -rf boost_*
3737

38-
ENV CMAKE_MAJOR=3 CMAKE_MINOR=30 CMAKE_PATCH=5
38+
ENV CMAKE_MAJOR=3 CMAKE_MINOR=31 CMAKE_PATCH=8
3939

4040
RUN curl -sSL https://cmake.org/files/v${CMAKE_MAJOR}.${CMAKE_MINOR}/cmake-${CMAKE_MAJOR}.${CMAKE_MINOR}.${CMAKE_PATCH}.tar.gz | tar -xz && \
4141
cd cmake-${CMAKE_MAJOR}.${CMAKE_MINOR}.${CMAKE_PATCH} && ./bootstrap --parallel=`nproc` -- && make -j`nproc` && make install && \
4242
cd .. && rm -rf cmake-${CMAKE_MAJOR}.${CMAKE_MINOR}.${CMAKE_PATCH}
4343

44-
ENV CCACHE_MAJOR=4 CCACHE_MINOR=10 CCACHE_PATCH=2
44+
ENV CCACHE_MAJOR=4 CCACHE_MINOR=11 CCACHE_PATCH=3
4545

4646
RUN \
4747
if [ $AUDITWHEEL_ARCH == "aarch64" ] && [ $AUDITWHEEL_POLICY == "manylinux2014" ]; then \

0 commit comments

Comments
 (0)