Fix builds on windows

emmett-framework · Oct 12, 2023 · 59e3595 · 59e3595
1 parent 0114c9a
commit 59e3595
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 56 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,17 +3,17 @@ name: build
 on: workflow_dispatch
 
 env:
-  MATURIN_VERSION: 1.2.3
+  MATURIN_VERSION: 1.3.0
   PY_ALL: 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
 
 jobs:
-  wheel-unix:
+  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]
+        os: [ubuntu, macos, windows]
         target: [x86_64, aarch64]
         manylinux: [auto]
         include:
@@ -41,30 +41,14 @@ jobs:
       - uses: pyo3/maturin-action@v1
         with:
           maturin-version: v${{ env.MATURIN_VERSION }}
+          rust-toolchain: stable
           command: build
-          args: --release --interpreter ${{ matrix.interpreter || env.PY_ALL }}
+          args: --release --out dist --interpreter ${{ matrix.interpreter || env.PY_ALL }}
           target: ${{ matrix.target }}
           manylinux: ${{ matrix.manylinux || 'auto' }}
           container: ${{ matrix.container }}
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
-          name: wheels
-          path: target/wheels
-
-  wheel-win:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: pyo3/maturin-action@v1
-        with:
-          maturin-version: v${{ env.MATURIN_VERSION }}
-          command: build
-          args: --release --interpreter ${{ env.PY_ALL }}
-          target: x86_64
-          manylinux: auto
-      - name: Upload wheels
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: target/wheels
+          name: dist
+          path: dist
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,24 +21,22 @@ jobs:
     - uses: pyo3/maturin-action@v1
       with:
         maturin-version: v${{ env.MATURIN_VERSION }}
-        command: build
-        args: --release --sdist --interpreter 3.10
-        target: x64
-        manylinux: off
-        container: off
+        rust-toolchain: stable
+        command: sdist
+        args: --out dist
     - name: Upload sdist
       uses: actions/upload-artifact@v3
       with:
-        name: wheels
-        path: target/wheels/*.tar.gz
+        name: dist
+        path: dist
 
-  wheel-unix:
+  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]
+        os: [ubuntu, macos, windows]
         target: [x86_64, aarch64]
         manylinux: [auto]
         include:
@@ -66,41 +64,26 @@ jobs:
       - uses: pyo3/maturin-action@v1
         with:
           maturin-version: v${{ env.MATURIN_VERSION }}
+          rust-toolchain: stable
           command: build
-          args: --release --interpreter ${{ matrix.interpreter || env.PY_ALL }}
+          args: --release --out dist --interpreter ${{ matrix.interpreter || env.PY_ALL }}
           target: ${{ matrix.target }}
           manylinux: ${{ matrix.manylinux || 'auto' }}
           container: ${{ matrix.container }}
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
-          name: wheels
-          path: target/wheels
-
-  wheel-win:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: pyo3/maturin-action@v1
-        with:
-          maturin-version: v${{ env.MATURIN_VERSION }}
-          command: build
-          args: --release --interpreter ${{ env.PY_ALL }}
-          target: x86_64
-          manylinux: auto
-      - name: Upload wheels
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: target/wheels
+          name: dist
+          path: dist
 
   release:
     runs-on: ubuntu-latest
-    needs: [ sdist, wheel-unix, wheel-win ]
+    needs: [ sdist, wheels ]
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: wheels
+          name: dist
+          path: dist
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
@@ -110,4 +93,4 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
         run: |
           pip install --upgrade pip twine
-          twine upload --skip-existing *
+          twine upload --skip-existing dist/*
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ aes = { version = "0.8" }
 cfb8 = { version = "0.8" }
 cfb-mode = { version = "0.8" }
 ctr = { version = "0.9" }
-pyo3 = { version = "=0.20", features = ["extension-module"] }
+pyo3 = { version = "=0.20", features = ["extension-module", "generate-import-lib"] }
 ring = { version = "0.16" }
 
 [build-dependencies]