Skip to content

Commit

Permalink
ref: Remove x86 wheels (#3596)
Browse files Browse the repository at this point in the history
  • Loading branch information
asottile-sentry committed May 15, 2024
1 parent 64310da commit 8e3c729
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
fail-fast: false
matrix:
build-arch:
- i686
- x86_64
- aarch64

Expand Down
1 change: 0 additions & 1 deletion py/.craft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ targets:
requireNames:
- /^sentry_relay-.*-py2\.py3-none-macosx_10_15_x86_64.whl$/
- /^sentry_relay-.*-py2\.py3-none-macosx_11_0_arm64.whl$/
- /^sentry_relay-.*-py2\.py3-none-.*manylinux2014_i686.*\.whl$/
- /^sentry_relay-.*-py2\.py3-none-.*manylinux2014_x86_64.*\.whl$/
- /^sentry_relay-.*-py2\.py3-none-.*manylinux2014_aarch64.*\.whl$/
- /^sentry-relay-.*\.zip$/
4 changes: 4 additions & 0 deletions py/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Unreleased

- Remove publishing of x86 wheels. [#3596](https://github.com/getsentry/relay/pull/3596)

## 0.8.64

- Revert the Python version bump back to Python 3.10.
Expand Down
8 changes: 1 addition & 7 deletions py/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,17 @@ FROM amd64/centos:7
ARG TARGET

# Install tools for cross compiling if the requested target is different from currenly running image and
# also threat the i686 a little bit special, since we must configure addition things and install different set of libraries
RUN yum -y update \
&& yum install -y git gcc make curl libffi-devel dnf epel-release ca-certificates \
perl-core openssl openssl-devel pkgconfig libatomic \
&& if [ ${TARGET} != "i686" ] && [ "$(uname -m)" != ${TARGET} ]; then \
&& 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}" --release 7 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"; \
elif [ ${TARGET} == "i686" ]; then \
yum install -t -y glibc-devel.i686 libgcc.i686 \
&& if ! [ -f /usr/lib/libatomic.so ]; then ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so; fi \
&& RG=$(find /opt -type f -executable -name gcc) \
&& if ! [ -z $RG ]; then ln -s $RG /usr/bin/i686-linux-gnu-gcc; else ln -s /usr/bin/gcc /usr/bin/i686-linux-gnu-gcc; fi; \
fi \
&& yum clean all \
&& rm -rf /var/cache/yum
Expand Down
6 changes: 1 addition & 5 deletions py/manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ yum -y -q install gcc libffi-devel
export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/

# Build wheels
if [ "$AUDITWHEEL_ARCH" == "i686" ]; then
LINUX32=linux32
fi

$LINUX32 /opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel

# Audit wheels
for wheel in dist/*-linux_*.whl; do
Expand Down

0 comments on commit 8e3c729

Please sign in to comment.