Merge pull request #255 from nyx-space/hotfix/py-release

Trying to allow re-release manually
nyx-space · Nov 22, 2023 · 3553b2e · 3553b2e
2 parents 81367af + 83c5b25
commit 3553b2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -30,7 +30,7 @@ jobs:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter -F python
           sccache: 'true'
-          # manylinux: false
+          rust-toolchain: 1.74
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -69,7 +69,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter -F python
-          # sccache: 'true' # sscache seems to have broken on Windows on Github -- https://github.com/nyx-space/nyx/actions/runs/5156694943/jobs/9288035780
+          rust-toolchain: 1.74
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
@@ -95,12 +95,17 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
+
+      - name: Update cargo packages
+        run: cargo update
+
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter -F python
           sccache: 'true'
+          rust-toolchain: 1.74
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -127,6 +132,7 @@ jobs:
         with:
           command: sdist
           args: --out dist
+          rust-toolchain: 1.74
       - name: Upload sdist
         uses: actions/upload-artifact@v3
         with:
@@ -136,7 +142,7 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: github.ref_type == 'tag'
     needs: [linux, windows, macos, sdist]
     steps:
       - uses: actions/download-artifact@v3

diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
@@ -158,9 +158,6 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
-
-      - name: release-plz
-        uses: MarcoIeni/[email protected]      
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@master