Trying cibuildwheel with win and linux GH actions

chocoteam · Oct 1, 2024 · a201b06 · a201b06
1 parent 9723b10
commit a201b06
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 45 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -2,8 +2,7 @@ name: MacOS
 
 on:
   push:
-    branches: ["no"]
-    #branches: [ "master", "dev_actions" ]
+    branches: [ "master", "dev_actions" ]
     tags: [ '**' ]
 
 jobs:
@@ -16,24 +15,6 @@ jobs:
         os: [macos-14, macos-13, macos-12]
         platform: [arm64, x86_x64]
         python-version: ["3.11"]
-        #python-version: ["3.12", "3.11", "3.10", "3.9"]
-#        include:
-#          - os: macos-14
-#            platform: arm64
-#            python-version: "3.12"
-#            force: true
-#          - os: macos-14
-#            platform: arm64
-#            python-version: "3.11"
-#            force: true
-#          - os: macos-14
-#            platform: x86_x64
-#            python-version: "3.12"
-#            force: true
-#          - os: macos-14
-#            platform: x86_x64
-#            python-version: "3.11"
-#            force: true
     steps:
       # if matrix.force is not true or event is not tag, skip
       - if: ${{ matrix.force }} != true || (github.event_name == 'push' && !startsWith(github.ref, 'refs/tags'))
@@ -75,7 +56,7 @@ jobs:
           pip install -r requirements_tests.txt
           pytest
       - name: Upload wheel artifacts
-        #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
         uses: actions/upload-artifact@v4
         with:
           name: wheel-${{matrix.os}}-${{matrix.python-version}}-${{matrix.platform}}-artifact
@@ -85,32 +66,12 @@ jobs:
   upload-pypi-macos:
     needs: build-macos
     runs-on: ubuntu-20.04
-    #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     strategy:
       matrix:
         os: [macos-14, macos-13, macos-12]
         platform: [arm64, x86_x64]
         python-version: [ "3.11" ]
-#        os: [macos-13, macos-12]
-#        platform: [arm64, x86_x64]
-#        python-version: ["3.12", "3.11", "3.10", "3.9"]
-#        include:
-#          - os: macos-14
-#            platform: arm64
-#            python-version: "3.12"
-#            force: true
-#          - os: macos-14
-#            platform: arm64
-#            python-version: "3.11"
-#            force: true
-#          - os: macos-14
-#            platform: x86_x64
-#            python-version: "3.12"
-#            force: true
-#          - os: macos-14
-#            platform: x86_x64
-#            python-version: "3.11"
-#            force: true
     steps:
     - name: Download artifacts
       uses: actions/download-artifact@v4
@@ -120,9 +81,10 @@ jobs:
     - name: List files
       run: ls -R
     - name: Upload to PyPi
-      #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
         verbose: true
+        skip-existing: true
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
         env:
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_ARCHS: x86_x64
         with:
           output-dir: dist
       - name: Test
@@ -71,3 +71,4 @@ jobs:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
           verbose: true
+          skip-existing: true
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -86,9 +86,10 @@ jobs:
     - name: List files
       run: ls -R
     - name: Upload to PyPi
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+      #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
         verbose: true
+        skip-existing: true