Review CI workflows

emmett-framework · Oct 27, 2024 · ddf092b · ddf092b
1 parent 4901209
commit ddf092b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: build
 on: workflow_dispatch
 
 env:
-  MATURIN_VERSION: 1.7.0
+  MATURIN_VERSION: 1.7.4
   PY_ALL: 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.8 pypy3.9 pypy3.10
 
 jobs:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ on:
       - master
 
 env:
-  MATURIN_VERSION: 1.7.0
+  MATURIN_VERSION: 1.7.4
   PYTHON_VERSION: 3.12
 
 jobs:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,11 +4,9 @@ on:
   push:
     tags:
       - v*.*.*
-  # release:
-  #   types: [published]
 
 env:
-  MATURIN_VERSION: 1.7.0
+  MATURIN_VERSION: 1.7.4
   PY_ALL: 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.8 pypy3.9 pypy3.10
 
 jobs:
@@ -35,11 +33,10 @@ jobs:
 
   wheels:
     name: wheel ${{ matrix.platform || matrix.os }}(${{ matrix.target }}) - ${{ matrix.manylinux || 'auto' }}
-    runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos, windows]
+        os: [ubuntu, macos]
         target: [x86_64, aarch64]
         manylinux: [auto]
         include:
@@ -55,7 +52,7 @@ jobs:
             interpreter: pypy3.8 pypy3.9 pypy3.10
           - os: macos
             target: aarch64
-            interpreter: 3.8 3.9 pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.8 pypy3.9 pypy3.10
           - os: ubuntu
             platform: linux
             target: aarch64
@@ -68,20 +65,8 @@ jobs:
             platform: linux
             target: aarch64
             manylinux: musllinux_1_1
-          - os: windows
-            target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10
-        exclude:
-          - os: windows
-            target: aarch64
-          # PGO builds
-          # - os: ubuntu
-          #   target: x86_64
-          #   manylinux: auto
-          # - os: macos
-          #   target: x86_64
-          # - os: windows
-          #   target: x86_64
+
+    runs-on: ${{ matrix.os }}-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set jemalloc for aarch64 Linux
@@ -105,7 +90,7 @@ jobs:
           path: dist
 
   wheels-pgo:
-    name: pgo-wheel ${{ matrix.os }} (${{ matrix.interpreter}})
+    name: pgo-wheel ${{ matrix.platform || matrix.os }} (${{ matrix.interpreter}})
     strategy:
       fail-fast: false
       matrix:
@@ -115,6 +100,17 @@ jobs:
         include:
           - os: ubuntu-latest
             platform: linux
+          - os: windows-latest
+            platform: windows
+          - os: windows-latest
+            platform: windows
+            interpreter: pypy3.8
+          - os: windows-latest
+            platform: windows
+            interpreter: pypy3.9
+          - os: windows-latest
+            platform: windows
+            interpreter: pypy3.10
 
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ on:
       - master
 
 env:
-  MATURIN_VERSION: 1.7.0
+  MATURIN_VERSION: 1.7.4
 
 jobs:
   linux:
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ on: @@
           - master
     env:
-      MATURIN_VERSION: 1.7.0
+      MATURIN_VERSION: 1.7.4
       PYTHON_VERSION: 3.12
     jobs:
@@ Expand Down @@