wip

.github/workflows/ci.yml

@@ -1,163 +1,117 @@
-name: Build
+name: CI
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+  pull_request:
+  workflow_dispatch:
 
-env:
-  PACKAGE_NAME: fastcrc
-  PYTHON_VERSION: "3.6" # to build abi3 wheels
+permissions:
+  contents: read
 
 jobs:
-  test:
+  linux:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ]
-
+        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-
-      - uses: actions-rs/toolchain@v1
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
         with:
-          toolchain: stable
-          override: true
-
-      - name: Run cargo check
-        uses: actions-rs/cargo@v1
+          target: ${{ matrix.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+          manylinux: auto
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
         with:
-          command: check
-
-      - name: Install setuptools and setuptools-rust
-        run: |
-          python -m pip install --upgrade wheel setuptools setuptools-rust
-
-      - name: Install fastcrc
-        run: |
-          python setup.py install
-
-      - name: Run tests
-        run: |
-          cd tests
-          python test_fastcrc.py
+          name: wheels
+          path: dist
 
-  build_package:
-    # Adapted from https://github.com/pydantic/pydantic-core/blob/main/.github/workflows/ci.yml
-    name: build on ${{ matrix.platform || matrix.os }} (${{ matrix.target }} - ${{ matrix.manylinux || 'auto' }})
-    needs: [ test ]
+  windows:
+    runs-on: windows-latest
     strategy:
-      fail-fast: false
       matrix:
-        os: [ubuntu, macos, windows]
-        target: [x86_64, aarch64]
-        manylinux: [auto]
-        include:
-          - os: ubuntu
-            platform: linux
-          - os: windows
-            ls: dir
-          - os: windows
-            ls: dir
-            target: i686
-            python-architecture: x86
-          - os: macos
-            target: aarch64
-          - os: ubuntu
-            platform: linux
-            target: i686
-          - 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
-          # musllinux
-          - os: ubuntu
-            platform: linux
-            target: x86_64
-            manylinux: musllinux_1_1
-          - os: ubuntu
-            platform: linux
-            target: aarch64
-            manylinux: musllinux_1_1
-        exclude:
-          # Windows on arm64 only supports Python 3.11+
-          - os: windows
-            target: aarch64
-
-    runs-on: ${{ matrix.os }}-latest
+        target: [x64, x86]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
       - uses: actions/checkout@v3
-
-      - name: set up python
-        uses: actions/setup-python@v4
+      - uses: actions/setup-python@v4
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: ${{ matrix.python-architecture || 'x64' }}
-
-      - name: build sdist
-        if: ${{ matrix.os == 'ubuntu' && matrix.target == 'x86_64' && matrix.manylinux == 'auto' }}
-        uses: messense/maturin-action@v1
+          python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.target }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
         with:
-          command: sdist
-          args: --out dist
-          rust-toolchain: stable
+          target: ${{ matrix.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
 
-      - name: build wheels
-        uses: messense/maturin-action@v1
+  macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        target: [x86_64, aarch64]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          manylinux: ${{ matrix.manylinux || 'auto' }}
-          container: ${{ matrix.container }}
-          args: --release --out dist
-          rust-toolchain: stable
-
-      - run: ${{ matrix.ls || 'ls -lh' }} dist/
-
-      - run: pip install -U twine
-
-      - run: twine check dist/*
-
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
 
-  list-pypi-files:
-    needs: [ build_package ]
+  sdist:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
-
-      - name: get dist artifacts
-        uses: actions/download-artifact@v3
+      - name: Build sdist
+        uses: PyO3/maturin-action@v1
+        with:
+          command: sdist
+          args: --out dist
+      - name: Upload sdist
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
 
-      - run: ls -lh dist/
-      - run: echo "`ls dist | wc -l` files"
-
-  upload_pypi:
-    needs: [ build_package ]
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+  release:
+    name: Release
     runs-on: ubuntu-latest
+    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [linux, windows, macos, sdist]
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
       - name: Publish to PyPI
-        uses: messense/maturin-action@v1
+        uses: PyO3/maturin-action@v1
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
         with:
           command: upload
-          args: --skip-existing *
+          args: --non-interactive --skip-existing *