Merge branch 'main' into pre-commit-ci-update-config

egraphs-good · Jul 18, 2023 · ce48879 · ce48879
2 parents b6ce797 + 6d65218
commit ce48879
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 269 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -8,6 +8,7 @@ on:
     tags:
       - "*"
   pull_request:
+  workflow_dispatch:
 
 # Allow one concurrent deployment
 concurrency:
@@ -86,18 +87,14 @@ jobs:
   linux:
     name: build linux
     runs-on: ubuntu-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [test]
     steps:
       - uses: actions/checkout@v3
-      - uses: PyO3/maturin-action@v1.31.0
+      - uses: PyO3/maturin-action@v1.40.1
         with:
           manylinux: auto
           command: build
           args: --release --sdist -o dist --find-interpreter
-          # Pin rust toolchain, so it won't install 1.65.0, otherwise get this error:
-          # Attempting to include the sdist output tarball dist/egglog-0.1.0.tar.gz into itself! Check 'cargo package --list' output.
-          # https://github.com/metadsl/egglog-python/actions/runs/3388178229/jobs/5629843303
-          rust-toolchain: "1.64.0"
       - name: Upload wheels
         uses: actions/upload-artifact@v2
         with:
@@ -107,10 +104,10 @@ jobs:
   windows:
     name: build windows
     runs-on: windows-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [test]
     steps:
       - uses: actions/checkout@v3
-      - uses: PyO3/maturin-action@v1.31.0
+      - uses: PyO3/maturin-action@v1.40.1
         with:
           command: build
           args: --release -o dist --find-interpreter
@@ -123,10 +120,10 @@ jobs:
   macos:
     name: build macos
     runs-on: macos-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [test]
     steps:
       - uses: actions/checkout@v3
-      - uses: PyO3/maturin-action@v1.31.0
+      - uses: PyO3/maturin-action@v1.40.1
         with:
           command: build
           args: --release -o dist --universal2 --find-interpreter
@@ -139,14 +136,14 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch')
     needs: [macos, windows, linux]
     steps:
       - uses: actions/download-artifact@v2
         with:
           name: wheels
       - name: Publish to PyPI
-        uses: PyO3/maturin-action@v1.31.0
+        uses: PyO3/maturin-action@v1.40.1
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
         with: