Merge branch 'main' into subscription

SharezoneApp · Apr 5, 2023 · 7671f48 · 7671f48
2 parents ea73111 + 9368707
commit 7671f48
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/.github/workflows/app_ci.yml b/.github/workflows/app_ci.yml
@@ -11,6 +11,14 @@
 
 name: app-ci
 
+concurrency:
+  group: app-ci-${{ github.head_ref }}
+  # In order to conserve the use of GitHub Actions, we cancel the running action
+  # of the previous commit. This means that if you first commit "A" and then
+  # commit "B" to the pull request a few minutes later, the workflow for commit
+  # "A" will be cancelled.
+  cancel-in-progress: true
+
 on:
   # Triggers the workflow on pull request events
   pull_request:

diff --git a/.github/workflows/cli_ci.yml b/.github/workflows/cli_ci.yml
@@ -8,6 +8,14 @@
 
 name: cli-ci
 
+concurrency:
+  group: cli-ci-${{ github.head_ref }}
+  # In order to conserve the use of GitHub Actions, we cancel the running action
+  # of the previous commit. This means that if you first commit "A" and then
+  # commit "B" to the pull request a few minutes later, the workflow for commit
+  # "A" will be cancelled.
+  cancel-in-progress: true
+
 on:
   pull_request:
     types: