Use PyPy binaries from manylinux image instead of our own (#7678) (#7693

)
pyca · Oct 11, 2022 · 5b12ac8 · 5b12ac8
1 parent 277ee0d
commit 5b12ac8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
@@ -26,30 +26,30 @@ jobs:
       fail-fast: false
       matrix:
         PYTHON:
-          - { VERSION: "cp36-cp36m", PATH: "/opt/python/cp36-cp36m/bin/python", ABI_VERSION: 'cp36' }
-          - { VERSION: "pypy3.7", PATH: "/opt/pypy3.7/bin/pypy" }
-          - { VERSION: "pypy3.8", PATH: "/opt/pypy3.8/bin/pypy" }
-          - { VERSION: "pypy3.9", PATH: "/opt/pypy3.9/bin/pypy" }
+          - { VERSION: "cp36-cp36m", ABI_VERSION: 'cp36' }
+          - { VERSION: "pp37-pypy37_pp73" }
+          - { VERSION: "pp38-pypy38_pp73" }
+          - { VERSION: "pp39-pypy39_pp73" }
         MANYLINUX:
           - { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64" }
           - { name: "manylinux_2_24_x86_64", CONTAINER: "cryptography-manylinux_2_24:x86_64"}
           - { name: "manylinux_2_28_x86_64", CONTAINER: "cryptography-manylinux_2_28:x86_64"}
           - { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
         exclude:
           # There are no readily available musllinux PyPy distributions
-          - PYTHON: { VERSION: "pypy3.7", PATH: "/opt/pypy3.7/bin/pypy" }
+          - PYTHON: { VERSION: "pp37-pypy37_pp73" }
             MANYLINUX: { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64" }
-          - PYTHON: { VERSION: "pypy3.8", PATH: "/opt/pypy3.8/bin/pypy" }
+          - PYTHON: { VERSION: "pp38-pypy38_pp73" }
             MANYLINUX: { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
-          - PYTHON: { VERSION: "pypy3.9", PATH: "/opt/pypy3.9/bin/pypy" }
+          - PYTHON: { VERSION: "pp39-pypy39_pp73" }
             MANYLINUX: { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
     name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
     steps:
       - uses: actions/checkout@v3.0.2
         with:
           # The tag to build or the tag received by the tag event
           ref: ${{ github.event.inputs.version || github.ref }}
-      - run: ${{ matrix.PYTHON.PATH }} -m venv .venv
+      - run: /opt/python/${{ matrix.PYTHON.VERSION }}/bin/python -m venv .venv
       - name: Install Python dependencies
         run: .venv/bin/pip install -U pip wheel cffi setuptools-rust
       - name: Make sdist