You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by st...@apache.org on 2021/06/03 11:17:44 UTC
[apisix-dashboard] branch master updated: ci: use concurrency to
cancel duplicate workflow (#1929)
This is an automated email from the ASF dual-hosted git repository.
starsz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 9850df2 ci: use concurrency to cancel duplicate workflow (#1929)
9850df2 is described below
commit 9850df28b9539713566849069ba093b6be7c3be7
Author: Shuyang Wu <wo...@gmail.com>
AuthorDate: Thu Jun 3 07:17:38 2021 -0400
ci: use concurrency to cancel duplicate workflow (#1929)
Signed-off-by: yiyiyimu <wo...@gmail.com>
---
.github/actions/cancel-workflow-runs | 1 -
.github/workflows/backend-e2e-test.yml | 4 ++++
.github/workflows/deploy-with-docker.yml | 4 ++++
.github/workflows/frontend-e2e-test.yml | 5 +++++
.github/workflows/frontend-plugin-e2e-test.yml | 5 +++++
.github/workflows/make-build.yaml | 4 ++++
.github/workflows/test-frontend-multiple-node-build.yml | 4 ++++
.gitmodules | 3 ---
8 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/.github/actions/cancel-workflow-runs b/.github/actions/cancel-workflow-runs
deleted file mode 160000
index 8248bc1..0000000
--- a/.github/actions/cancel-workflow-runs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8248bc1feff049e98c0e6a96889b147199c38203
diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml
index fb7081b..5a59e7d 100644
--- a/.github/workflows/backend-e2e-test.yml
+++ b/.github/workflows/backend-e2e-test.yml
@@ -14,6 +14,10 @@ on:
- 'docs/**'
- 'web/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
backend-e2e-test:
runs-on: ubuntu-latest
diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml
index 184ab84..0a6e2fe 100644
--- a/.github/workflows/deploy-with-docker.yml
+++ b/.github/workflows/deploy-with-docker.yml
@@ -12,6 +12,10 @@ on:
paths-ignore:
- 'docs/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
build:
runs-on: ubuntu-latest
diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml
index 6e26a7a..cee98e5 100644
--- a/.github/workflows/frontend-e2e-test.yml
+++ b/.github/workflows/frontend-e2e-test.yml
@@ -11,6 +11,11 @@ on:
- master
paths-ignore:
- 'docs/**'
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
env:
CYPRESS_CACHE_FOLDER: cypress/cache
defaults:
diff --git a/.github/workflows/frontend-plugin-e2e-test.yml b/.github/workflows/frontend-plugin-e2e-test.yml
index bf29da5..00f3292 100644
--- a/.github/workflows/frontend-plugin-e2e-test.yml
+++ b/.github/workflows/frontend-plugin-e2e-test.yml
@@ -10,6 +10,11 @@ on:
- master
paths-ignore:
- 'docs/**'
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
env:
CYPRESS_CACHE_FOLDER: cypress/cache
defaults:
diff --git a/.github/workflows/make-build.yaml b/.github/workflows/make-build.yaml
index 211bf68..248990a 100644
--- a/.github/workflows/make-build.yaml
+++ b/.github/workflows/make-build.yaml
@@ -14,6 +14,10 @@ on:
paths-ignore:
- 'docs/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
make-build-test:
name: make build test
diff --git a/.github/workflows/test-frontend-multiple-node-build.yml b/.github/workflows/test-frontend-multiple-node-build.yml
index 33daefc..4fa437a 100644
--- a/.github/workflows/test-frontend-multiple-node-build.yml
+++ b/.github/workflows/test-frontend-multiple-node-build.yml
@@ -12,6 +12,10 @@ on:
branches:
- master
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
diff --git a/.gitmodules b/.gitmodules
index 8b4725e..1ee15dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule ".github/actions/cancel-workflow-runs"]
- path = .github/actions/cancel-workflow-runs
- url = https://github.com/potiuk/cancel-workflow-runs
[submodule ".github/actions/gitleaks-action"]
path = .github/actions/gitleaks-action
url = https://github.com/zricethezav/gitleaks-action