change matrix

carlos-rian · Oct 27, 2023 · 1a95393 · 1a95393
1 parent c24ed0f
commit 1a95393
Showing 1 changed file with 28 additions and 29 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -50,6 +50,21 @@ jobs:
 
       - name: run test
         run: cargo test -p database -p convert -p py_types
+
+  build-sdist:
+    name: build sdist
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: PyO3/maturin-action@v1
+        with:
+          command: sdist
+          args: --out dist
+          rust-toolchain: stable
+      - uses: actions/upload-artifact@v3
+        with:
+          name: pypi_files
+          path: dist
 
   build:
     name: build on ${{ matrix.platform || matrix.os }} (${{ matrix.target }} - ${{ matrix.manylinux || 'auto' }})
@@ -63,71 +78,59 @@ jobs:
         include:
           - os: ubuntu
             platform: linux
-
           - os: windows
             ls: dir
-            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
-
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
           - os: windows
             ls: dir
             target: i686
             python-architecture: x86
             interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
-
+          - os: windows
+            ls: dir
+            target: aarch64
+            interpreter: 3.11 3.12
           - os: macos
             target: aarch64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
-
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
           - os: ubuntu
             platform: linux
             target: i686
-          # GCC 4.8.5 in manylinux2014 container doesn't support c11 atomic
-          # we use manylinux_2_24 container for aarch64 and armv7 targets instead,
           - os: ubuntu
             platform: linux
             target: aarch64
-            container: messense/manylinux_2_24-cross:aarch64
 
           - os: ubuntu
             platform: linux
             target: armv7
-            container: messense/manylinux_2_24-cross:armv7
             interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
-
           # musllinux
           - os: ubuntu
             platform: linux
             target: x86_64
             manylinux: musllinux_1_1
-
           - os: ubuntu
             platform: linux
             target: aarch64
             manylinux: musllinux_1_1
-
           - os: ubuntu
             platform: linux
             target: ppc64le
-            container: messense/manylinux_2_24-cross:ppc64le
             interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
-
           - os: ubuntu
             platform: linux
             target: s390x
-            container: messense/manylinux_2_24-cross:s390x
             interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
 
         exclude:
-           # Optimized PGO builds for x86_64 manylinux and windows follow a different matrix,
+          # Optimized PGO builds for x86_64 manylinux and windows follow a different matrix,
           # maybe in future maturin-action can support this automatically
           - os: ubuntu
             target: x86_64
             manylinux: auto
-
           - os: windows
             target: x86_64
           # Windows on arm64 only supports Python 3.11+
-
           - os: windows
             target: aarch64
 
@@ -140,12 +143,6 @@ jobs:
         with:
           python-version: "3.11"
           architecture: ${{ matrix.python-architecture || 'x64' }}
-
-      - name: install rust stable
-        id: rust-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: llvm-tools
 
       - run: pip install -U twine 'black>=22.3.0,<23' typing_extensions toml
 
@@ -167,7 +164,7 @@ jobs:
           args: >
             --release
             --out dist
-            --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12' }}
+            --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12 pypy3.7 pypy3.8 pypy3.9 pypy3.10' }} ${{ matrix.extra-build-args }}
           rust-toolchain: stable
           sccache: true
           docker-options: -e CI
@@ -190,13 +187,14 @@ jobs:
         os: [ubuntu, windows]
         target: [x86_64]
         manylinux: [auto]
-        interpreter:  ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        interpreter: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy3.7", "pypy3.8", "pypy3.9", "pypy3.10"]
         include:
           - os: ubuntu
             platform: linux
-
           - os: windows
             ls: dir
+          - interpreter: 3.12-dev
+            maturin-interpreter: "3.12"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -207,13 +205,14 @@ jobs:
         with:
           python-version: ${{ matrix.interpreter }}
           architecture: ${{ matrix.python-architecture || 'x64' }}
-
+      
       - name: install rust stable
         id: rust-toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           components: llvm-tools
 
+
       - run: pip install -U twine 'black>=22.3.0,<23' typing_extensions toml
 
       - name: production - check package version