Tidy up

milesgranger · Apr 27, 2024 · 02f96fe · 02f96fe
1 parent d379a50
commit 02f96fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/CI-python.yml b/.github/workflows/CI-python.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.conf.os }}
     name: ${{ matrix.conf.os }}-${{ matrix.conf.target }}-${{ matrix.package.name }}-${{ matrix.python-version }}-${{ matrix.conf.python-architecture }}-${{ matrix.conf.manylinux }}
     strategy:
-      fail-fast: false #${{ !( startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') ) }}
+      fail-fast: ${{ !( startsWith(github.ref, 'refs/heads/master') || !startsWith(github.ref, 'refs/tags/') ) }}
       matrix:
         python-version: 
           - '3.8' 
@@ -151,10 +151,10 @@ jobs:
         with:
           target: ${{ matrix.conf.target-triple }}
 
-      # - uses: Swatinem/rust-cache@v2
-      #   name: Rust Cache
-      #   with:
-      #     prefix-key: ${{ matrix.conf.os }}-${{ matrix.conf.manylinux }}-${{ matrix.conf.target-triple }}-${{ matrix.conf.python-architecture }}-${{ matrix.package.name }}
+      - uses: Swatinem/rust-cache@v2
+        name: Rust Cache
+        with:
+          prefix-key: ${{ matrix.conf.os }}-${{ matrix.conf.target-triple }}-${{ matrix.package.name }}-${{ matrix.conf.python-architecture }}-${{ matrix.conf.manylinux }}
 
       - name: Setup (Mac)
         if: runner.os == 'macOS'
@@ -326,6 +326,7 @@ jobs:
 
       - name: Upload wheels
         uses: actions/upload-artifact@v4
+        if: ${{ ( startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') ) }}
         with:
           name: dist
           path: dist
@@ -353,14 +354,14 @@ jobs:
 
   pypi-publish:
     name: Upload ${{ matrix.package }} release to PyPI
+    if: startsWith(github.ref, 'refs/tags/')
     strategy:
       fail-fast: false
       matrix:
         package: 
           - cramjam
           - cramjam-cli
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
     needs: [build-test, build-sdist]
     environment:
       name: pypi

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@ __pycache__/
 benchenv/
 cramjam-python/_build
 
+Cargo.lock
+
 
 # Distribution / packaging
 .Python