Merge pull request #6 from yuchen0cc/main

build in manylinux2014
aliyun · Aug 29, 2024 · 258e9df · 258e9df
2 parents d9f173d + a98e939
commit 258e9df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
@@ -35,7 +35,7 @@ jobs:
         PYTHON_VERSION=${{ matrix.python }}
         PYTHON_VERSION=${PYTHON_VERSION//./}
         echo "PYTHON_VERSION=${PYTHON_VERSION}"
-        BUILD_IMAGE="ghcr.io/${GITHUB_REPOSITORY,,}/connector_builder:base"
+        BUILD_IMAGE="quay.io/pypa/manylinux2014_x86_64:2024-03-10-4935fcc"
         echo "BUILD_IMAGE=${BUILD_IMAGE}"
         RELEASE_IMAGE="ghcr.io/${GITHUB_REPOSITORY,,}/connector_builder:${RELEASE_VERSION}"
         echo "RELEASE_IMAGE=${RELEASE_IMAGE}"

diff --git a/.github/workflows/build_wheel/Dockerfile b/.github/workflows/build_wheel/Dockerfile
@@ -8,11 +8,12 @@ COPY --from=release /libosstorchconnector .
 COPY . .
 ARG PYTHON_VERSION
 ENV PY_VER=${PYTHON_VERSION}
-RUN source /root/miniconda3/etc/profile.d/conda.sh && \
-    export PATH="/root/miniconda3/bin:$PATH" && \
-    conda activate py${PY_VER} && \
+ENV PY_ABI_TAG=cp${PY_VER}-cp${PY_VER}
+RUN export PATH="/opt/python/${PY_ABI_TAG}/bin:$PATH" && \
+    python3 -V && \
     echo -e "[build_ext]\nlibrary_path=oss_connector.cpython-${PY_VER}-x86_64-linux-gnu.so" > setup.cfg && \
-    python3 -u setup.py bdist_wheel
+    python3 -u setup.py bdist_wheel && \
+    auditwheel repair dist/osstorchconnector*.whl -w repaired_wheel
 
 FROM scratch
-COPY --from=builder /libosstorchconnector/dist/osstorchconnector* /
+COPY --from=builder /libosstorchconnector/repaired_wheel/osstorchconnector* /