From 990598c3b0f7d8688b736fa5dc464ee04ed37f40 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Mon, 25 Jan 2021 11:12:31 +0100 Subject: [PATCH 1/3] chore: Switch to manylinux2010 --- py/.craft.yml | 4 ++-- py/CHANGELOG.md | 1 + py/manylinux.sh | 10 ++++++---- scripts/docker-manylinux.sh | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/py/.craft.yml b/py/.craft.yml index c7ad355b646..530c6d4b2aa 100644 --- a/py/.craft.yml +++ b/py/.craft.yml @@ -25,6 +25,6 @@ targets: requireNames: - /^sentry_relay-.*-py2.py3-none-macosx_10_15_x86_64.whl$/ - - /^sentry_relay-.*-py2.py3-none-manylinux1_i686.whl$/ - - /^sentry_relay-.*-py2.py3-none-manylinux1_x86_64.whl$/ + - /^sentry_relay-.*-py2.py3-none-manylinux2010_i686.whl$/ + - /^sentry_relay-.*-py2.py3-none-manylinux2010_x86_64.whl$/ - /^sentry-relay-.*.zip$/ diff --git a/py/CHANGELOG.md b/py/CHANGELOG.md index 062a0673698..a007ad5d606 100644 --- a/py/CHANGELOG.md +++ b/py/CHANGELOG.md @@ -12,6 +12,7 @@ - Add missing fields for Expect-CT reports. ([#865](https://github.com/getsentry/relay/pull/865)) - Support more directives in CSP reports, such as `block-all-mixed-content` and `require-trusted-types-for`. ([#876](https://github.com/getsentry/relay/pull/876)) - Fix a long-standing bug where log messages were not addressible as `$string`. ([#882](https://github.com/getsentry/relay/pull/882)) +- Use manylinux2010 to build releases instead of manylinux1 to fix issues with newer Rust. ## 0.8.1 diff --git a/py/manylinux.sh b/py/manylinux.sh index 09460e0733b..f32a00537bd 100644 --- a/py/manylinux.sh +++ b/py/manylinux.sh @@ -3,11 +3,13 @@ set -e # Install dependencies needed by our wheel echo "Installing packages..." -yum -y -q -e 0 install gcc libffi-devel openssl101e-devel +yum -y -q install gcc libffi-devel openssl-devel -export OPENSSL_INCLUDE_DIR=/usr/include/openssl101e -export I686_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib/openssl101e -export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib64/openssl101e +export OPENSSL_INCLUDE_DIR=/usr/include/openssl +export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ + +echo /usr/lib*/openssl* +echo /usr/include/openssl* # Install Rust curl https://sh.rustup.rs -sSf | sh -s -- -y diff --git a/scripts/docker-manylinux.sh b/scripts/docker-manylinux.sh index 4e582d0a2a6..05185d197fb 100755 --- a/scripts/docker-manylinux.sh +++ b/scripts/docker-manylinux.sh @@ -6,7 +6,7 @@ BUILD_DIR="/work" docker run \ -w /work/py \ -v `pwd`:/work \ - quay.io/pypa/manylinux1_${BUILD_ARCH} \ + quay.io/pypa/manylinux2010_${BUILD_ARCH} \ sh manylinux.sh # Fix permissions for shared directories From 90b5dc90a3b0a20257f96bdf8c32ba5012e9a7dc Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Mon, 25 Jan 2021 14:47:12 +0100 Subject: [PATCH 2/3] cleanup --- py/manylinux.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/py/manylinux.sh b/py/manylinux.sh index f32a00537bd..d38bb96c826 100644 --- a/py/manylinux.sh +++ b/py/manylinux.sh @@ -5,12 +5,8 @@ set -e echo "Installing packages..." yum -y -q install gcc libffi-devel openssl-devel -export OPENSSL_INCLUDE_DIR=/usr/include/openssl export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ -echo /usr/lib*/openssl* -echo /usr/include/openssl* - # Install Rust curl https://sh.rustup.rs -sSf | sh -s -- -y export PATH=~/.cargo/bin:$PATH From 8ae7d29369497a774746754525403e0103ee59ce Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Mon, 25 Jan 2021 14:52:56 +0100 Subject: [PATCH 3/3] add link to pr --- py/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/CHANGELOG.md b/py/CHANGELOG.md index a007ad5d606..b4e48f8afac 100644 --- a/py/CHANGELOG.md +++ b/py/CHANGELOG.md @@ -12,7 +12,7 @@ - Add missing fields for Expect-CT reports. ([#865](https://github.com/getsentry/relay/pull/865)) - Support more directives in CSP reports, such as `block-all-mixed-content` and `require-trusted-types-for`. ([#876](https://github.com/getsentry/relay/pull/876)) - Fix a long-standing bug where log messages were not addressible as `$string`. ([#882](https://github.com/getsentry/relay/pull/882)) -- Use manylinux2010 to build releases instead of manylinux1 to fix issues with newer Rust. +- Use manylinux2010 to build releases instead of manylinux1 to fix issues with newer Rust. ([#917](https://github.com/getsentry/relay/pull/917)) ## 0.8.1