ci[python]: Use maturin-action for Windows/macOS release (#4850)

pola-rs · Sep 30, 2022 · 246b600 · 246b600
1 parent cf85619
commit 246b600
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 51 deletions.
diff --git a/.github/workflows/create-py-mac-universal2-release.yaml b/.github/workflows/create-py-mac-universal2-release.yaml
@@ -2,38 +2,36 @@ name: Create macOs universal2/aarch64-apple-darwin python release
 
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-      - 'py-polars-v*' # Push events to matching py-polars-v*, i.e. py-polars-v1.0, py-polars-v20.15.10
+      - 'py-polars-v*'
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
-  build:
-    name: Create Release
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: ["macos-latest"]
-        python-version: ["3.7"]
+  macos-aarch64:
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2022-09-26
-      - name: Setup universal2 targets for Rust
-        run: |
-          rustup target add aarch64-apple-darwin
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Prepare maturin publish
-        shell: bash
+          python-version: '3.7'
+
+      - name: Fix README symlink
         run: |
           rm py-polars/README.md
           cp README.md py-polars/README.md
-          cd py-polars
-      - name: maturin publish
+
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2022-09-26
+
+      - name: Set up Rust targets
+        run: rustup target add aarch64-apple-darwin
+
+      - name: Publish wheel
         uses: messense/maturin-action@v1
         env:
           MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }}
@@ -45,4 +43,3 @@ jobs:
            # we don't run it because it is twice as big and not needed because we build
            # for both architectures separately
 #          args: -m py-polars/Cargo.toml --no-sdist --universal2 -o wheels -i python -u ritchie46
-
diff --git a/.github/workflows/create-py-release-windows-macos.yaml b/.github/workflows/create-py-release-windows-macos.yaml
@@ -2,43 +2,39 @@ name: Create Python release windows macos
 
 on:
   push:
-     # Sequence of patterns matched against refs/tags
     tags:
-      - 'py-polars-v*' # Push events to matching py-polars-v*, i.e. py-polars-v1.0, py-polars-v20.15.10
+      - 'py-polars-v*'
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
-  build:
-    name: Create Release
+  win-macos:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: ["macos-latest", "windows-latest"]
-        python-version: ["3.7"]
+        os: [macos-latest, windows-latest]
+
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@master
+      - uses: actions/setup-python@v4
         with:
-          toolchain: nightly-2022-09-26
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
+          python-version: '3.7'
+
+      - name: Fix README symlink
         run: |
-          pip install --upgrade pip
-          pip install maturin==0.13.2
+          rm py-polars/README.md
+          cp README.md py-polars/README.md
+
       - name: Publish wheel
-        shell: bash
+        uses: messense/maturin-action@v1
         env:
           MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }}
           RUSTFLAGS: -C target-feature=+fxsr,+sse,+sse2,+sse3,+sse4.1,+sse4.2
-        run: |
-          rm py-polars/README.md
-          cp README.md py-polars/README.md
-          cd py-polars
-          maturin publish \
-          --no-sdist \
-          --skip-existing \
-          -o wheels \
-          -i python \
-          --username ritchie46
+        with:
+          rust-toolchain: nightly-2022-09-26
+          maturin-version: '0.13.2'
+          command: publish
+          args: -m py-polars/Cargo.toml --no-sdist --skip-existing -o wheels -i python -u ritchie46