Skip to content

chore: Switch to manylinux2010 #917

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
merged 3 commits into from
Jan 26, 2021
Merged

chore: Switch to manylinux2010 #917

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
990598c
chore: Switch to manylinux2010
untitaker Jan 25, 2021
90b5dc9
cleanup
untitaker Jan 25, 2021
8ae7d29
add link to pr
untitaker Jan 25, 2021
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 py/.craft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$/
1 change: 1 addition & 0 deletions py/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. ([#917](https://github.com/getsentry/relay/pull/917))

## 0.8.1

Expand Down
6 changes: 2 additions & 4 deletions py/manylinux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ 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 PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/

# Install Rust
curl https://sh.rustup.rs -sSf | sh -s -- -y
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-manylinux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down