update deploy scripts

potassco · Apr 23, 2021 · 586b23c · 586b23c
1 parent 5ef0d84
commit 586b23c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.github/manylinux.py b/.github/manylinux.py
@@ -56,7 +56,7 @@ def compile_wheels(idx):
     for pybin in glob('/opt/python/*/bin'):
         # Requires Py3.6 or greater - on the docker image 3.5 is cp35-cp35m
         if "35" not in pybin:
-            args = [path.join(pybin, 'pip'), 'wheel', '--no-deps', '-w', 'wheelhouse/']
+            args = [path.join(pybin, 'pip'), 'wheel', '--verbose', '--no-deps', '-w', 'wheelhouse/']
             if idx is not None:
                 args.extend(['--extra-index-url', idx])
             args.extend(['./'])
@@ -92,6 +92,8 @@ def run():
 
     adjust_version(url)
 
+    if ARCH != "x86_64":
+        check_call(['sed', '-i', 's/, "cmake"//', 'pyproject.toml'])
 
     compile_wheels(idx)
 

diff --git a/.github/workflows/manylinux.yml b/.github/workflows/manylinux.yml
@@ -6,18 +6,17 @@ on:
       wip:
         description: 'Publish work in progress package.'
         required: false
-        default: true
+        default: 'true'
+      image:
+        description: 'Manylinux image to use.'
+        required: false
+        default: 'manylinux2014_x86_64'
 
 jobs:
   build_packages:
     runs-on: ubuntu-latest
     env:
-      PLAT: ${{ matrix.image }}
-
-    strategy:
-      matrix:
-        image:
-          - manylinux2014_x86_64
+      PLAT: ${{ github.event.inputs.image }}
 
     steps:
     - name: Checkout repo
@@ -28,19 +27,19 @@ jobs:
     - name: Pull images
       run: |
         docker pull multiarch/qemu-user-static
-        docker pull quay.io/pypa/${{ matrix.image }}:latest
+        docker pull quay.io/pypa/${{ github.event.inputs.image }}:latest
 
     - name: Set up QEMU
       run: |
         docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
     - name: Build wheels (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       run: |
-        docker run --rm -e PLAT --workdir /github/workspace -v $GITHUB_WORKSPACE:/"/github/workspace" quay.io/pypa/${{ matrix.image }} /opt/python/cp38-cp38/bin/python ".github/manylinux.py"
+        docker run --rm -e PLAT --workdir /github/workspace -v $GITHUB_WORKSPACE:/"/github/workspace" quay.io/pypa/${{ github.event.inputs.image }} /opt/python/cp38-cp38/bin/python ".github/manylinux.py"
 
     - name: Publish package to TestPyPI (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__
@@ -49,12 +48,12 @@ jobs:
         repository_url: https://test.pypi.org/legacy/
 
     - name: Build wheels (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       run: |
-        docker run --rm -e PLAT --workdir /github/workspace -v $GITHUB_WORKSPACE:/"/github/workspace" quay.io/pypa/${{ matrix.image }} /opt/python/cp38-cp38/bin/python ".github/manylinux.py" --release
+        docker run --rm -e PLAT --workdir /github/workspace -v $GITHUB_WORKSPACE:/"/github/workspace" quay.io/pypa/${{ github.event.inputs.image }} /opt/python/cp38-cp38/bin/python ".github/manylinux.py" --release
 
     - name: Publish package to TestPyPI (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__