From d83726698b5c769ef3d030aa786f0c8a2b72113d Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Fri, 27 Oct 2023 12:51:43 +0200
Subject: [PATCH] Use adapted version of generated workflow

---
 .github/workflows/publish.yml     | 97 +++++++++++++++++++------------
 instant-segment-py/Cargo.toml     |  3 -
 instant-segment-py/pyproject.toml |  3 +
 3 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8767192..6c66ae7 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,55 +3,78 @@ name: Publish
 on:
   push:
     tags:
-      - py-*
+      - 'py-*'
+  workflow_dispatch:
+
+permissions:
+  contents: read
 
 jobs:
-  Unix:
+  build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        python: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        include:
+          - os: ubuntu-latest
+            target: x86_64
+            python: "3.9"
+          - os: ubuntu-latest
+            target: x86_64
+            python: "3.10"
+          - os: ubuntu-latest
+            target: x86_64
+            python: "3.11"
+          - os: windows-latest
+            target: x64
+            python: "3.9"
+          - os: windows-latest
+            target: x64
+            python: "3.10"
+          - os: windows-latest
+            target: x64
+            python: "3.11"
+          - os: macos-latest
+            target: aarch64
+            python: "3.9"
+          - os: macos-latest
+            target: aarch64
+            python: "3.10"
+          - os: macos-latest
+            target: aarch64
+            python: "3.11"
 
     runs-on: ${{ matrix.os }}
-    environment: "Publish wheels"
-
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
-          architecture: x64
-      - name: Publish
-        uses: messense/maturin-action@v1
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
         with:
-          command: publish
-          args: -m instant-segment-py/Cargo.toml
-                --no-sdist
-                --username __token__
-                --password ${{ secrets.PYPI_TOKEN }}
-                --interpreter python${{ matrix.python }}
+          working-directory: instant-segment-py
+          target: ${{ matrix.target }}
+          args: --release --out ../dist --find-interpreter
+          sccache: 'true'
+          manylinux: auto
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
 
-  Windows:
-    runs-on: windows-latest
+  release:
     environment: "Publish wheels"
-
+    name: Release
+    runs-on: ubuntu-latest
+    needs: [build]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/download-artifact@v3
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Publish all versions
-        uses: messense/maturin-action@v1
+          name: wheels
+      - name: Publish to PyPI
+        uses: PyO3/maturin-action@v1
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
         with:
-          command: publish
-          args: -m instant-segment-py/Cargo.toml
-                --no-sdist
-                --username __token__
-                --password ${{ secrets.PYPI_TOKEN }}
+          command: upload
+          args: --non-interactive --skip-existing *
diff --git a/instant-segment-py/Cargo.toml b/instant-segment-py/Cargo.toml
index 5c52192..9d290df 100644
--- a/instant-segment-py/Cargo.toml
+++ b/instant-segment-py/Cargo.toml
@@ -20,6 +20,3 @@ bincode = "1.3.2"
 instant-segment = { version = "0.11", path = "../instant-segment", features = ["with-serde"] }
 pyo3 = { version = "0.20", features = ["extension-module"] }
 smartstring = "1"
-
-[package.metadata.maturin]
-name = "instant-segment"
diff --git a/instant-segment-py/pyproject.toml b/instant-segment-py/pyproject.toml
index 059693f..88fa21e 100644
--- a/instant-segment-py/pyproject.toml
+++ b/instant-segment-py/pyproject.toml
@@ -1,3 +1,6 @@
+[project]
+name = "instant-segment"
+
 [build-system]
 requires = ["maturin >= 1.0, < 2.0"]
 build-backend = "maturin"