+ d2133e6

Drop -march=native flag.

Author: sobomax

.github/workflows/build_and_test.yml

@@ -24,8 +24,8 @@ permissions:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build_and_test_python:
-    continue-on-error: true
     strategy:
+      fail-fast: false
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         compiler: ['gcc', 'clang']
@@ -78,59 +78,80 @@ jobs:
   python_wheels:
     needs: build_and_test_python
     runs-on: ubuntu-latest
-    container:
-      image: quay.io/pypa/manylinux_2_28:latest
+    permissions:
+      packages: write
     env:
       PY_VER: ${{ matrix.python-version }}
       BASE_IMAGE: quay.io/pypa/manylinux_2_28:latest
+      GHCR_REPO: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
     environment:
       name: pypi
       url: https://pypi.org/p/asyncproxy
-    permissions:
-      id-token: write
-    continue-on-error: true
     strategy:
+      fail-fast: false
       matrix:
         python-version: ['3.9', '3.11', '3.12']
     steps:
-    - name: Install git
-      run: |
-        yum install -y git redhat-lsb-core gnupg2 wget ca-certificates yum-utils jq
-        yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-        yum install -y docker-ce-cli
+    - name: Set up Python ${{ env.PY_VER }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ env.PY_VER }}
 
     - uses: actions/checkout@v4
 
-    - name: Set up Python
-      run: sh -x scipts/build/install_depends_yum.sh
-
-    - name: Install dependencies
-      run: sh -x scipts/build/install_depends_wheels.sh
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Set dynamic environment
       id: set-env
       run: |
         PLATFORMS="`docker manifest inspect ${{ env.BASE_IMAGE }} | \
           jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)\(if .platform.variant != null then "/\(.platform.variant)" else "" end)"' | \
           sort -u | grep -v unknown | paste -sd ','`"
-        BUILD_MATRIX="`echo ${PLATFORMS} | tr ',' '\n'  | jq -R . | jq -s . | tr '\n' ' '`"
         GIT_BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
         GIT_BRANCH="${GIT_BRANCH#refs/tags/}"
-        BUILD_IMAGE="${{ inputs.ghcr-repo }}:rtp.io-${{ inputs.rtpp-tag }}-${GIT_BRANCH}"
+        BUILD_IMAGE="${GHCR_REPO}:${GIT_BRANCH}-py${PY_VER}"
         echo "Platforms: ${PLATFORMS}"
-        echo "platforms=${PLATFORMS}" >> $GITHUB_OUTPUT
-        echo "build-matrix=${BUILD_MATRIX}" >> $GITHUB_OUTPUT
-        echo "build-image=${BUILD_IMAGE}" >> $GITHUB_OUTPUT
-        echo "git-branch=${GIT_BRANCH}" >> $GITHUB_OUTPUT
-
-    - name: build
+        echo "Build Image: ${BUILD_IMAGE}"
+        echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
+        echo "BUILD_IMAGE=${BUILD_IMAGE}" >> $GITHUB_ENV
+
+    - name: Build Docker image
+      uses: docker/build-push-action@v6
+      env:
+        CACHE_SPEC: "type=registry,ref=${{ env.BUILD_IMAGE }}-buildcache"
+      with:
+        context: .
+        file: ./docker/Dockerfile.python_wheels
+        build-args: |
+          BASE_IMAGE=${{ env.BASE_IMAGE }}
+          PY_VER=${{ env.PY_VER }}
+        platforms: ${{ env.PLATFORMS }}
+        push: false
+        outputs: type=local,dest=.
+        cache-from: ${{ env.CACHE_SPEC }}
+        cache-to: ${{ env.CACHE_SPEC }},mode=max
+
+    - name: Show context tree
+      run: ls -R .
+
+    - name: Collect Wheels
       run: |
-        python${PY_VER} setup.py build sdist
-        python${PY_VER} -m build --wheel
-        auditwheel repair dist/*.whl --wheel-dir dist/
+        mv `find dist -type f` dist
+        rmdir `find python/ -type d -depth 1 -depth`
+
+    - name: Show context tree
+      run: ls -R dist
 
     - name: Publish package distributions to PyPI
       if: github.event_name == 'release' && github.event.action == 'created'

docker/Dockerfile.python_wheels

@@ -0,0 +1,27 @@
+# syntax=docker/dockerfile:1.7-labs
+
+ARG BASE_IMAGE="quay.io/pypa/manylinux_2_28:latest"
+FROM --platform=$TARGETPLATFORM $BASE_IMAGE AS build
+LABEL maintainer="Maksym Sobolyev <[email protected]>"
+
+USER root
+
+WORKDIR /src
+
+ARG TARGETPLATFORM
+ARG PY_VER
+RUN --mount=type=bind,source=scripts/build,target=scripts/build \
+ sh -x scripts/build/install_depends_yum.sh
+RUN --mount=type=bind,source=scripts/build,target=scripts/build \
+ sh -x scripts/build/install_depends_wheels.sh
+
+COPY --exclude=.git --exclude=.github --exclude=docker --exclude=dist \
+ --exclude=scripts . .
+
+RUN python${PY_VER} setup.py build sdist
+RUN python${PY_VER} -m build --wheel
+RUN auditwheel repair dist/*.whl --wheel-dir dist_out
+RUN ls -R dist_out
+
+FROM scratch AS export
+COPY --from=build /src/dist_out /dist

scipts/build/install_depends_wheels.sh renamed to scripts/build/install_depends_wheels.sh

@@ -8,4 +8,4 @@ then
   dnf module enable python${PY_VER} -y
 fi
 
-dnf install -y python${PY_VER} python${PY_VER}-devel
+dnf install -y redhat-lsb-core python${PY_VER} python${PY_VER}-devel

scipts/build/install_depends_yum.sh renamed to scripts/build/install_depends_yum.sh

@@ -24,10 +24,7 @@
 
 debug_opts = ('-g3', '-O0')
 nodebug_opts = ('-DNO_DEBUG',)
-if not is_mac and not is_win:
-    nodebug_opts += ('-march=native', '-O3')
-else:
-    nodebug_opts += ('-O3',) if not is_win else ()
+nodebug_opts += ('-O3',) if not is_win else ()
 if False:
     extra_compile_args.extend(debug_opts)
     extra_link_args.extend(debug_opts)