You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/06/03 10:55:44 UTC
[apisix] branch master updated: ci: use concurrency to cancel
duplicate workflow (#4364)
This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new c61261a ci: use concurrency to cancel duplicate workflow (#4364)
c61261a is described below
commit c61261af8d19557b77535c9c745f4f8182bb63b2
Author: Shuyang Wu <wo...@gmail.com>
AuthorDate: Thu Jun 3 06:55:36 2021 -0400
ci: use concurrency to cancel duplicate workflow (#4364)
Signed-off-by: yiyiyimu <wo...@gmail.com>
---
.github/actions/cancel-workflow-runs | 1 -
.github/workflows/build.yml | 4 ++++
.github/workflows/centos7-ci.yml | 4 ++++
.github/workflows/chaos.yml | 4 ++++
.github/workflows/fuzzing-ci.yaml | 4 ++++
.github/workflows/workflow-cancel.yml | 27 ---------------------------
.gitmodules | 3 ---
7 files changed, 16 insertions(+), 31 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/build.yml b/.github/workflows/build.yml
index 8b8fc83..a6c3437 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,10 @@ on:
paths-ignore:
- 'docs/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
build:
strategy:
diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 30176af..4c5bb3e 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -10,6 +10,10 @@ on:
paths-ignore:
- 'docs/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
test_apisix:
name: run ci on centos7
diff --git a/.github/workflows/chaos.yml b/.github/workflows/chaos.yml
index 2b5ff9d..15998a3 100644
--- a/.github/workflows/chaos.yml
+++ b/.github/workflows/chaos.yml
@@ -7,6 +7,10 @@ on:
paths-ignore:
- 'docs/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
chaos-test:
runs-on: ubuntu-latest
diff --git a/.github/workflows/fuzzing-ci.yaml b/.github/workflows/fuzzing-ci.yaml
index 8eb52c0..de15b7b 100644
--- a/.github/workflows/fuzzing-ci.yaml
+++ b/.github/workflows/fuzzing-ci.yaml
@@ -12,6 +12,10 @@ on:
paths-ignore:
- 'docs/**'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
test_apisix:
name: run fuzzing
diff --git a/.github/workflows/workflow-cancel.yml b/.github/workflows/workflow-cancel.yml
deleted file mode 100644
index ad34ced..0000000
--- a/.github/workflows/workflow-cancel.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Cancelling Duplicates
-on:
- workflow_run:
- workflows:
- - 'CI'
- - 'CI Centos7'
- - 'Chaos Test'
- - 'fuzzing'
- 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.3.4
- 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"]'
diff --git a/.gitmodules b/.gitmodules
index 27d141c..beb354b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "t/toolkit"]
path = t/toolkit
url = https://github.com/api7/test-toolkit.git
-[submodule ".github/actions/cancel-workflow-runs"]
- path = .github/actions/cancel-workflow-runs
- url = https://github.com/potiuk/cancel-workflow-runs