Keep usage of manylinux_2014 for wider suport of glibc (#343)

Continue building wheels with manylinux_2014 to ensure broader compatibility with systems using older glibc versions, maximizing distribution support

This reverts commit 7e3793e.

Author: IsaevIlya

.github/workflows/wheels.yml

@@ -97,6 +97,8 @@ jobs:
       # Run cibuildwheel manually, as the current runner uses setup-python
       # https://github.com/pypa/cibuildwheel/issues/1623
       - run: >
+          CIBW_MANYLINUX_X86_64_IMAGE=manylinux2014
+          CIBW_MANYLINUX_AARCH64_IMAGE=manylinux2014
           python -m pipx run
           cibuildwheel
           "s3torchconnectorclient"

run_cibuildwheel_on_ec2.sh

@@ -31,4 +31,4 @@ export S3_EXPRESS_REGION=${EXPRESS_REGION_NAME}
 export S3_EXPRESS_BUCKET=${EXPRESS_BUCKET_NAME}
 export S3_CUSTOM_ENDPOINT_URL=${S3_CUSTOM_ENDPOINT_URL}
 
-cibuildwheel --output-dir wheelhouse --platform linux s3torchconnectorclient
+CIBW_MANYLINUX_X86_64_IMAGE=manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE=manylinux2014 cibuildwheel --output-dir wheelhouse --platform linux s3torchconnectorclient

s3torchconnectorclient/pyproject.toml

@@ -77,29 +77,20 @@ skip = "*musllinux* *i686"
 
 [tool.cibuildwheel.linux]
 before-all = [
-    "yum -y update",
-    "yum -y install openssl3 openssl3-devel",
-    "yum install -y gcc-toolset-10-gcc",
-    "yum install -y gcc-toolset-10-gcc-c++",
-    "yum install -y clang clang-devel llvm-toolset",
-
-    "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y",
-    "bash -c 'platform=$(uname -p); if [ \"$platform\" == \"aarch64\" ]; then sed -i \"s|centos/7|altarch/7|g\" /etc/yum.repos.d/*.repo; fi'",
-
-    "yum install -y fuse",
-    "yum install -y fuse-devel",
-    "yum install -y make",
-    "yum install -y git",
-    "yum install -y pkgconfig",
-    "yum install -y tar",
-    "yum install -y wget"
+  "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y",
+  "bash -c 'platform=$(uname -p); if [ \"$platform\" == \"aarch64\" ]; then sed -i \"s|centos/7|altarch/7|g\" /etc/yum.repos.d/*.repo; fi'",
+  "yum install -y fuse",
+  "yum install -y fuse-devel",
+  "yum install -y make",
+  "yum install -y git",
+  "yum install -y pkgconfig",
+  "yum install -y tar",
+  "yum install -y wget",
+  "yum install -y devtoolset-10-gcc",
+  "yum install -y devtoolset-10-gcc-c++",
+  "yum install -y llvm-toolset-7.0-clang"
 ]
-
-[tool.cibuildwheel.linux.environment]
-PATH = "/usr/lib64/ccache:/usr/lib64/llvm:/opt/rh/gcc-toolset-10/root/usr/bin:$HOME/.cargo/bin:$PATH"
-LD_LIBRARY_PATH = "/usr/lib64/llvm:/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:$LD_LIBRARY_PATH"
-CC = "/opt/rh/gcc-toolset-10/root/usr/bin/gcc"
-CXX = "/opt/rh/gcc-toolset-10/root/usr/bin/g++"
+environment = { PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin:/opt/rh/devtoolset-10/root/usr/bin:$HOME/.cargo/bin:$PATH", LD_LIBRARY_PATH="/opt/rh/llvm-toolset-7.0/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib", CC="/opt/rh/devtoolset-10/root/usr/bin/gcc", CXX="/opt/rh/devtoolset-10/root/usr/bin/g++" }
 
 [tool.cibuildwheel.macos]
 environment = { MACOSX_DEPLOYMENT_TARGET = "10.12" }