Merge pull request #986 from sigstore/master-to-main

use main on concurrency checks

Author: loosebazooka

.github/workflows/ci.yaml

@@ -15,20 +15,20 @@ on:
   pull_request: {}
   workflow_call: {} # allow this workflow to be called by other workflows
 
-concurrency:
-  # On master/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.ref }}-ci
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
 jobs:
   build:
     strategy:
       matrix:
         java-version: [11, 17]
       fail-fast: false
 
+    concurrency:
+      # 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 }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.github/workflows/conformance.yml

@@ -1,7 +1,7 @@
 name: Conformance Tests
 
 on:
-  push: 
+  push:
     branches: [main]
   pull_request: {}
   # TODO: add cron
@@ -15,6 +15,13 @@ jobs:
         sigstore-env: [production, staging]
       fail-fast: false
 
+    concurrency:
+      # 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 }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/examples.yaml

@@ -14,8 +14,8 @@ jobs:
     name: Build and run release examples on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     concurrency:
-      group: ${{ github.ref }}-${{ matrix.os }}-examples-release
-      cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-release
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
     permissions:
       id-token: write
@@ -53,8 +53,8 @@ jobs:
     name: Build and run dev examples on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     concurrency:
-      group: ${{ github.ref }}-${{ matrix.os }}-examples-dev
-      cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-dev
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
     permissions:
       id-token: write

.github/workflows/gradle-wrapper-validation.yaml

@@ -1,5 +1,5 @@
 name: "Validate Gradle Wrapper"
-on: 
+on:
   push:
     branches: [main]
   pull_request: {}

.github/workflows/tuf-conformance.yml

@@ -15,6 +15,13 @@ jobs:
         java-version: [11, 17]
       fail-fast: false
 
+    concurrency:
+      # 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 }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2