From 1c42e0fd033c7c81407eda8b12c7bbc7d4597e91 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Fri, 28 Jun 2024 11:23:06 -0700 Subject: [PATCH 1/3] Remove unnecessary comment --- .github/workflows/pr-merge.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr-merge.yaml b/.github/workflows/pr-merge.yaml index 96a57acba53..f3f348b6b1f 100644 --- a/.github/workflows/pr-merge.yaml +++ b/.github/workflows/pr-merge.yaml @@ -17,6 +17,5 @@ jobs: validate: uses: ./.github/workflows/validate.yml snapshot: - # Run validation then deploy snapshot release needs: validate uses: ./.github/workflows/snapshotrelease.yaml From 30afd59c486bd1cd2d6263ca971cffc20d748c42 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Fri, 28 Jun 2024 11:23:22 -0700 Subject: [PATCH 2/3] Hardcode workflow name in validate because github.workflow is inherited from parent --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a5690c9d448..4b9f1fb37fc 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -15,7 +15,7 @@ env: MAVEN_HTTP_ARGS: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -Dmaven.wagon.http.retryHandler.count=3' concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: validate-${{ github.ref }} cancel-in-progress: true jobs: From e8c91f34630150c1c4269d16dc60c4c6dce2f6f9 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Fri, 28 Jun 2024 12:38:57 -0700 Subject: [PATCH 3/3] Change to reset hung validation run --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 4b9f1fb37fc..6f895265ee3 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -15,7 +15,7 @@ env: MAVEN_HTTP_ARGS: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -Dmaven.wagon.http.retryHandler.count=3' concurrency: - group: validate-${{ github.ref }} + group: Validate-${{ github.ref }} cancel-in-progress: true jobs: