From 8e3c7298d8cc699cae24ae1053ee7ee6b0244c10 Mon Sep 17 00:00:00 2001
From: anthony sottile <103459774+asottile-sentry@users.noreply.github.com>
Date: Wed, 15 May 2024 07:10:11 -0400
Subject: [PATCH] ref: Remove x86 wheels (#3596)

---
 .github/workflows/build_library.yml | 1 -
 py/.craft.yml                       | 1 -
 py/CHANGELOG.md                     | 4 ++++
 py/Dockerfile                       | 8 +-------
 py/manylinux.sh                     | 6 +-----
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml
index 31f85bf4a4..9dbb1262dc 100644
--- a/.github/workflows/build_library.yml
+++ b/.github/workflows/build_library.yml
@@ -15,7 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         build-arch:
-          - i686
           - x86_64
           - aarch64
 
diff --git a/py/.craft.yml b/py/.craft.yml
index 298eacbf14..d0bd6c310e 100644
--- a/py/.craft.yml
+++ b/py/.craft.yml
@@ -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$/
diff --git a/py/CHANGELOG.md b/py/CHANGELOG.md
index 5d751deff3..17e27ce50d 100644
--- a/py/CHANGELOG.md
+++ b/py/CHANGELOG.md
@@ -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.
diff --git a/py/Dockerfile b/py/Dockerfile
index 02ef0b59fd..27a11d18a3 100644
--- a/py/Dockerfile
+++ b/py/Dockerfile
@@ -4,11 +4,10 @@ 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 \
@@ -16,11 +15,6 @@ RUN yum -y update \
     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
diff --git a/py/manylinux.sh b/py/manylinux.sh
index c147160ddd..cae0c42d41 100644
--- a/py/manylinux.sh
+++ b/py/manylinux.sh
@@ -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