From bd1f2e7e4edcdab052f08a590a300fa4e737be76 Mon Sep 17 00:00:00 2001 From: David Herberth Date: Thu, 4 Jul 2024 09:18:10 +0200 Subject: [PATCH 1/6] build(lib): Update manylinux container to 2_28 --- .github/workflows/build_library.yml | 4 ++-- scripts/docker-manylinux.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml index e8421e9338..33ef3d8488 100644 --- a/.github/workflows/build_library.yml +++ b/.github/workflows/build_library.yml @@ -2,8 +2,8 @@ name: Library Release Build on: push: - branches: - - release-library/** + # branches: + # - release-library/** env: CARGO_TERM_COLOR: always diff --git a/scripts/docker-manylinux.sh b/scripts/docker-manylinux.sh index dfe3247d1d..a9b93802ef 100755 --- a/scripts/docker-manylinux.sh +++ b/scripts/docker-manylinux.sh @@ -34,7 +34,7 @@ docker run \ -v "$(pwd):/work" \ -e SKIP_RELAY_LIB_BUILD=1 \ -e CARGO_BUILD_TARGET \ - quay.io/pypa/manylinux2014_${TARGET} \ + quay.io/pypa/manylinux_2_28_${TARGET} \ sh manylinux.sh # Fix permissions for shared directories From 7ba962d8408b0dddf5583953d7c5ce2a6ba036d7 Mon Sep 17 00:00:00 2001 From: David Herberth Date: Thu, 4 Jul 2024 09:22:26 +0200 Subject: [PATCH 2/6] almalinux 8 --- py/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/Dockerfile b/py/Dockerfile index 27a11d18a3..94e1f255aa 100644 --- a/py/Dockerfile +++ b/py/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/centos:7 +FROM almalinux:8 # This must be lower case - used in the paths and packages names ARG TARGET @@ -13,7 +13,7 @@ RUN yum -y update \ curl -L -s https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7-aarch64 > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 \ && cat /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 >> /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ; \ fi \ - && dnf --forcearch "${TARGET}" --release 7 install -y gcc glibc glibc-devel --installroot "/usr/${TARGET}-linux-gnu/sys-root/" || true \ + && dnf --forcearch "${TARGET}" --releasever=8 install -y gcc glibc glibc-devel --installroot "/usr/${TARGET}-linux-gnu/sys-root/" || true \ && ln -s "/usr/${TARGET}-linux-gnu/sys-root/usr/lib64/libgcc_s.so.1" "/usr/${TARGET}-linux-gnu/sys-root/usr/lib64/libgcc_s.so"; \ fi \ && yum clean all \ From 75333a938d5d6ea37fda10e2607b7a7ca13a1c24 Mon Sep 17 00:00:00 2001 From: David Herberth Date: Thu, 4 Jul 2024 09:46:48 +0200 Subject: [PATCH 3/6] revert ci triggers --- .github/workflows/build_library.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml index 33ef3d8488..e8421e9338 100644 --- a/.github/workflows/build_library.yml +++ b/.github/workflows/build_library.yml @@ -2,8 +2,8 @@ name: Library Release Build on: push: - # branches: - # - release-library/** + branches: + - release-library/** env: CARGO_TERM_COLOR: always From d0def1f656b8248830afbc1cdcbaf2a7c7291a0b Mon Sep 17 00:00:00 2001 From: David Herberth Date: Thu, 4 Jul 2024 09:50:37 +0200 Subject: [PATCH 4/6] changelog --- py/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/py/CHANGELOG.md b/py/CHANGELOG.md index c4b5654100..ef7e756e97 100644 --- a/py/CHANGELOG.md +++ b/py/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +- Build wheels with manylinux_2_28 and alma linux 8. [#3787](https://github.com/getsentry/relay/pull/3787) + ## 0.8.67 ### Various fixes & improvements From 54354bae1a25d825bdf8657a1fc7dca6213a4907 Mon Sep 17 00:00:00 2001 From: David Herberth Date: Thu, 4 Jul 2024 09:53:48 +0200 Subject: [PATCH 5/6] one more cleanup --- .github/workflows/build_library.yml | 4 ++-- py/Dockerfile | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml index e8421e9338..33ef3d8488 100644 --- a/.github/workflows/build_library.yml +++ b/.github/workflows/build_library.yml @@ -2,8 +2,8 @@ name: Library Release Build on: push: - branches: - - release-library/** + # branches: + # - release-library/** env: CARGO_TERM_COLOR: always diff --git a/py/Dockerfile b/py/Dockerfile index 94e1f255aa..e117479042 100644 --- a/py/Dockerfile +++ b/py/Dockerfile @@ -9,10 +9,6 @@ RUN yum -y update \ perl-core openssl openssl-devel pkgconfig libatomic \ && if [ "$(uname -m)" != ${TARGET} ]; then \ yum install -y "binutils-${TARGET}-linux-gnu" "gcc-${TARGET}-linux-gnu" "gcc-c++-${TARGET}-linux-gnu" \ - && if [ ${TARGET} == "aarch64" ]; then \ - curl -L -s https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7-aarch64 > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 \ - && cat /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 >> /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ; \ - fi \ && dnf --forcearch "${TARGET}" --releasever=8 install -y gcc glibc glibc-devel --installroot "/usr/${TARGET}-linux-gnu/sys-root/" || true \ && ln -s "/usr/${TARGET}-linux-gnu/sys-root/usr/lib64/libgcc_s.so.1" "/usr/${TARGET}-linux-gnu/sys-root/usr/lib64/libgcc_s.so"; \ fi \ From 9e624694acad7360fe856b6364c18d748f8236c6 Mon Sep 17 00:00:00 2001 From: David Herberth Date: Thu, 4 Jul 2024 09:56:32 +0200 Subject: [PATCH 6/6] revert ci triggers --- .github/workflows/build_library.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml index 33ef3d8488..e8421e9338 100644 --- a/.github/workflows/build_library.yml +++ b/.github/workflows/build_library.yml @@ -2,8 +2,8 @@ name: Library Release Build on: push: - # branches: - # - release-library/** + branches: + - release-library/** env: CARGO_TERM_COLOR: always