From 6cb06fcc745a870f5bcd8913cb5d3e9f19dd45be Mon Sep 17 00:00:00 2001
From: MichaelKora <michael.koras0@gmail.com>
Date: Fri, 10 Nov 2023 13:53:28 +0100
Subject: [PATCH] Cancel only on tag branch. and avoid canceling in workflows
 that create/release tags

---
 .github/workflows/bump-version-release.yaml           | 4 ----
 .github/workflows/docker-build-and-publish.yaml       | 2 +-
 .github/workflows/helm-gke-deploy.yaml                | 4 ++--
 .github/workflows/helm-gke-destroy.yaml               | 4 ++--
 .github/workflows/helm-multi-release.yaml             | 2 +-
 .github/workflows/helm-release.yaml                   | 2 +-
 .github/workflows/java-gradle-base.yaml               | 2 +-
 .github/workflows/java-gradle-docker.yaml             | 2 +-
 .github/workflows/java-gradle-library.yaml            | 2 +-
 .github/workflows/java-gradle-plugin.yaml             | 2 +-
 .github/workflows/java-gradle-release.yaml            | 4 ----
 .github/workflows/kustomize-gke-deploy.yaml           | 2 +-
 .github/workflows/kustomize-gke-destroy.yaml          | 2 +-
 .github/workflows/python-poetry-publish-pypi.yaml     | 2 +-
 .github/workflows/python-poetry-publish-snapshot.yaml | 2 +-
 .github/workflows/python-poetry-release.yaml          | 4 ----
 .github/workflows/release-tag-versions.yaml           | 4 ----
 .github/workflows/test-python-setup-poetry.yaml       | 2 +-
 18 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/bump-version-release.yaml b/.github/workflows/bump-version-release.yaml
index 1246f2eb3..a891d118e 100644
--- a/.github/workflows/bump-version-release.yaml
+++ b/.github/workflows/bump-version-release.yaml
@@ -44,10 +44,6 @@ on:
         description: "The old version in your `.bumpversion.cfg` file."
         value: ${{ jobs.release.outputs.old-version }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-bump-version-release
-  cancel-in-progress: true
-
 jobs:
   release:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml
index c49edb1f8..cb51c61c3 100644
--- a/.github/workflows/docker-build-and-publish.yaml
+++ b/.github/workflows/docker-build-and-publish.yaml
@@ -70,7 +70,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-docker
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   docker-build:
diff --git a/.github/workflows/helm-gke-deploy.yaml b/.github/workflows/helm-gke-deploy.yaml
index 61023c6a0..5f1e226a7 100644
--- a/.github/workflows/helm-gke-deploy.yaml
+++ b/.github/workflows/helm-gke-deploy.yaml
@@ -72,8 +72,8 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-helm-deploy
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-helm-gke-deploy
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   deploy:
diff --git a/.github/workflows/helm-gke-destroy.yaml b/.github/workflows/helm-gke-destroy.yaml
index 5aab2803f..45b28105f 100644
--- a/.github/workflows/helm-gke-destroy.yaml
+++ b/.github/workflows/helm-gke-destroy.yaml
@@ -43,8 +43,8 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-helm-destroy
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-helm-gke-destroy
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   destroy:
diff --git a/.github/workflows/helm-multi-release.yaml b/.github/workflows/helm-multi-release.yaml
index b7c7006dd..7a2020a04 100644
--- a/.github/workflows/helm-multi-release.yaml
+++ b/.github/workflows/helm-multi-release.yaml
@@ -46,7 +46,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-helm-multi-release
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   helm-lint:
diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index a0b437a88..d2cc37fdc 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -64,7 +64,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-helm-release
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   helm-lint:
diff --git a/.github/workflows/java-gradle-base.yaml b/.github/workflows/java-gradle-base.yaml
index c32c01cbf..ec399c913 100644
--- a/.github/workflows/java-gradle-base.yaml
+++ b/.github/workflows/java-gradle-base.yaml
@@ -54,7 +54,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-java-gradle-base
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   build:
diff --git a/.github/workflows/java-gradle-docker.yaml b/.github/workflows/java-gradle-docker.yaml
index 59a76cb6a..282f9e3f0 100644
--- a/.github/workflows/java-gradle-docker.yaml
+++ b/.github/workflows/java-gradle-docker.yaml
@@ -71,7 +71,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-java-gradle-docker
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   build-and-test:
diff --git a/.github/workflows/java-gradle-library.yaml b/.github/workflows/java-gradle-library.yaml
index 8ba6adb09..0b70789cc 100644
--- a/.github/workflows/java-gradle-library.yaml
+++ b/.github/workflows/java-gradle-library.yaml
@@ -61,7 +61,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-java-gradle-lib
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   build-and-test:
diff --git a/.github/workflows/java-gradle-plugin.yaml b/.github/workflows/java-gradle-plugin.yaml
index 4c3690bc6..69b6945ba 100644
--- a/.github/workflows/java-gradle-plugin.yaml
+++ b/.github/workflows/java-gradle-plugin.yaml
@@ -67,7 +67,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-java-gradle-plugin
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   build-and-test:
diff --git a/.github/workflows/java-gradle-release.yaml b/.github/workflows/java-gradle-release.yaml
index 4cba62e79..247523c43 100644
--- a/.github/workflows/java-gradle-release.yaml
+++ b/.github/workflows/java-gradle-release.yaml
@@ -56,10 +56,6 @@ on:
         description: "Bumped version of your project."
         value: ${{ jobs.release.outputs.release-version }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-java-gradle-release
-  cancel-in-progress: true
-
 jobs:
   release:
     name: Release
diff --git a/.github/workflows/kustomize-gke-deploy.yaml b/.github/workflows/kustomize-gke-deploy.yaml
index 04a0ba292..0d46b56fa 100644
--- a/.github/workflows/kustomize-gke-deploy.yaml
+++ b/.github/workflows/kustomize-gke-deploy.yaml
@@ -45,7 +45,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-kustomize-gke-deploy
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   deploy:
diff --git a/.github/workflows/kustomize-gke-destroy.yaml b/.github/workflows/kustomize-gke-destroy.yaml
index 1eadab80f..f00981a71 100644
--- a/.github/workflows/kustomize-gke-destroy.yaml
+++ b/.github/workflows/kustomize-gke-destroy.yaml
@@ -40,7 +40,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-kustomize-gke-destroy
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   destroy:
diff --git a/.github/workflows/python-poetry-publish-pypi.yaml b/.github/workflows/python-poetry-publish-pypi.yaml
index 05b91ff29..e2c1dcb8f 100644
--- a/.github/workflows/python-poetry-publish-pypi.yaml
+++ b/.github/workflows/python-poetry-publish-pypi.yaml
@@ -31,7 +31,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-python-poetry-publish-pypi
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   publish:
diff --git a/.github/workflows/python-poetry-publish-snapshot.yaml b/.github/workflows/python-poetry-publish-snapshot.yaml
index 092f8d66b..054b025bd 100644
--- a/.github/workflows/python-poetry-publish-snapshot.yaml
+++ b/.github/workflows/python-poetry-publish-snapshot.yaml
@@ -35,7 +35,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-python-poetry-publish-snapshot
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   publish-snapshot:
diff --git a/.github/workflows/python-poetry-release.yaml b/.github/workflows/python-poetry-release.yaml
index 47d60809f..c20a6eb01 100644
--- a/.github/workflows/python-poetry-release.yaml
+++ b/.github/workflows/python-poetry-release.yaml
@@ -58,10 +58,6 @@ on:
         description: "The old version of the package."
         value: ${{ jobs.create-release.outputs.old-version }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-python-poetry-release
-  cancel-in-progress: true
-
 jobs:
   create-release:
     name: Release
diff --git a/.github/workflows/release-tag-versions.yaml b/.github/workflows/release-tag-versions.yaml
index ca84824e2..3578ea300 100644
--- a/.github/workflows/release-tag-versions.yaml
+++ b/.github/workflows/release-tag-versions.yaml
@@ -32,10 +32,6 @@ on:
         description: "The GitHub token for committing the changes."
         required: true
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-release-version
-  cancel-in-progress: true
-
 jobs:
   bump_and_release:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-python-setup-poetry.yaml b/.github/workflows/test-python-setup-poetry.yaml
index 58d5580e7..d7ee58044 100644
--- a/.github/workflows/test-python-setup-poetry.yaml
+++ b/.github/workflows/test-python-setup-poetry.yaml
@@ -13,7 +13,7 @@ env:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-test-python-setup-poetry
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   tests: