This is an automated email from the ASF dual-hosted git repository.
liuxiran 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 9b18c35 ci: refine removing duplicate workflows (#2082)
9b18c35 is described below
commit 9b18c35d3c61ccfb8c48bd458568c86ac902491e
Author: Shuyang Wu <wosoyo...@gmail.com>
AuthorDate: Sun Aug 22 21:26:52 2021 -0400
ci: refine removing duplicate workflows (#2082)
Signed-off-by: yiyiyimu <wosoyo...@gmail.com>
---
.github/workflows/backend-e2e-test.yml | 2 +-
.github/workflows/deploy-with-docker.yml | 2 +-
.github/workflows/frontend-e2e-test.yml | 2 +-
.github/workflows/frontend-plugin-e2e-test.yml | 2 +-
.github/workflows/make-build.yaml | 2 +-
.../test-frontend-multiple-node-build.yml | 2 +-
.github/workflows/workflow-cancel.yaml | 29 ----------------------
7 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/backend-e2e-test.yml
b/.github/workflows/backend-e2e-test.yml
index 5a59e7d..dee0e64 100644
--- a/.github/workflows/backend-e2e-test.yml
+++ b/.github/workflows/backend-e2e-test.yml
@@ -15,7 +15,7 @@ on:
- 'web/**'
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' &&
github.run_number || github.ref }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/deploy-with-docker.yml
b/.github/workflows/deploy-with-docker.yml
index 0a6e2fe..eb6a8b7 100644
--- a/.github/workflows/deploy-with-docker.yml
+++ b/.github/workflows/deploy-with-docker.yml
@@ -13,7 +13,7 @@ on:
- 'docs/**'
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' &&
github.run_number || github.ref }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/frontend-e2e-test.yml
b/.github/workflows/frontend-e2e-test.yml
index 449a755..6687308 100644
--- a/.github/workflows/frontend-e2e-test.yml
+++ b/.github/workflows/frontend-e2e-test.yml
@@ -13,7 +13,7 @@ on:
- 'docs/**'
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' &&
github.run_number || github.ref }}
cancel-in-progress: true
env:
diff --git a/.github/workflows/frontend-plugin-e2e-test.yml
b/.github/workflows/frontend-plugin-e2e-test.yml
index 41ca23a..51c918e 100644
--- a/.github/workflows/frontend-plugin-e2e-test.yml
+++ b/.github/workflows/frontend-plugin-e2e-test.yml
@@ -12,7 +12,7 @@ on:
- 'docs/**'
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' &&
github.run_number || github.ref }}
cancel-in-progress: true
env:
diff --git a/.github/workflows/make-build.yaml
b/.github/workflows/make-build.yaml
index e8e6efa..3ca3a56 100644
--- a/.github/workflows/make-build.yaml
+++ b/.github/workflows/make-build.yaml
@@ -15,7 +15,7 @@ on:
- 'docs/**'
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' &&
github.run_number || github.ref }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/test-frontend-multiple-node-build.yml
b/.github/workflows/test-frontend-multiple-node-build.yml
index 0952e97..d9775cf 100644
--- a/.github/workflows/test-frontend-multiple-node-build.yml
+++ b/.github/workflows/test-frontend-multiple-node-build.yml
@@ -13,7 +13,7 @@ on:
- master
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' &&
github.run_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
diff --git a/.github/workflows/workflow-cancel.yaml
b/.github/workflows/workflow-cancel.yaml
deleted file mode 100644
index b7c750e..0000000
--- a/.github/workflows/workflow-cancel.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Cancelling Duplicates
-on:
- workflow_run:
- workflows:
- - 'Frontend e2e test'
- - 'Frontend e2e test for plugin'
- - 'Test and Deploy with Docker'
- - 'Test building web in multiple node version'
- - 'Backend E2E Test'
- - 'make build'
- types: ['requested']
-
-jobs:
- cancel-duplicate-workflow-runs:
- name: "Cancel duplicate workflow runs"
- runs-on: ubuntu-latest
- steps:
- - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
- uses: actions/checkout@v2
- with:
- submodules: recursive
-
- - uses: ./.github/actions/cancel-workflow-runs
- name: "Cancel duplicate workflow runs"
- with:
- cancelMode: allDuplicates
- token: ${{ secrets.GITHUB_TOKEN }}
- sourceRunId: ${{ github.event.workflow_run.id }}
- skipEventTypes: '["push", "schedule"]'
