Merge pull request #989 from sigstore/fix-concurrency-maybe

fix concurrency

Author: loosebazooka

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
       # On main/release, we don't want any jobs cancelled
       # On PR branches, we cancel the job if new commits are pushed
       # More info: https://stackoverflow.com/a/70972844/1261287
-      group: ${{ github.workflow }}-${{ github.github.ref }}-${{ matrix.java-version }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}-${{ matrix.java-version }}
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
     runs-on: ubuntu-latest

.github/workflows/conformance.yml

@@ -19,7 +19,7 @@ jobs:
       # On main/release, we don't want any jobs cancelled
       # On PR branches, we cancel the job if new commits are pushed
       # More info: https://stackoverflow.com/a/70972844/1261287
-      group: ${{ github.workflow }}-${{ github.github.ref }}-${{ matrix.java-version }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}-${{ matrix.java-version }}-${{ matrix.sigstore-env }}
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
     runs-on: ubuntu-latest

.github/workflows/tuf-conformance.yml

@@ -19,7 +19,7 @@ jobs:
       # On main/release, we don't want any jobs cancelled
       # On PR branches, we cancel the job if new commits are pushed
       # More info: https://stackoverflow.com/a/70972844/1261287
-      group: ${{ github.workflow }}-${{ github.github.ref }}-${{ matrix.java-version }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}-${{ matrix.java-version }}
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
     runs-on: ubuntu-latest