Group workflow by branch except main.

jhipster · Jun 3, 2021 · 6e2809c · 6e2809c
1 parent 7683fb5
commit 6e2809c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -19,7 +19,8 @@
 
 name: Angular
 concurrency:
-  group: angular-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: angular-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -19,7 +19,8 @@
 
 name: Generator
 concurrency:
-  group: generator-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: generator-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -19,7 +19,8 @@
 
 name: 'Validate Gradle Wrapper'
 concurrency:
-  group: gradle-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: gradle-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/incremental-changelog.yml b/.github/workflows/incremental-changelog.yml
@@ -19,7 +19,8 @@
 
 name: Incremental Changelog
 concurrency:
-  group: incremental-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: incremental-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/jdl.yml b/.github/workflows/jdl.yml
@@ -19,7 +19,8 @@
 
 name: JDL tests
 concurrency:
-  group: jdl-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: jdl-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -19,7 +19,8 @@
 
 name: React
 concurrency:
-  group: react-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: react-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml
@@ -19,7 +19,8 @@
 
 name: Vue
 concurrency:
-  group: vue-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: vue-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push:

diff --git a/.github/workflows/webflux.yml b/.github/workflows/webflux.yml
@@ -19,7 +19,8 @@
 
 name: Webflux
 concurrency:
-  group: webflux-${{ github.head_ref || github.sha }}
+  # Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
+  group: webflux-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}
   cancel-in-progress: true
 on:
   push: