From 25096c3a67dda18971ab533cc083cf3b2c1627f9 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Sun, 30 May 2021 16:10:10 +0100 Subject: [PATCH 1/2] update ci/cd to remove duplicated jobs Signed-off-by: Wenqi Li --- .github/workflows/cleanup.yml | 20 -------------------- .github/workflows/pythonapp.yml | 4 ++++ .github/workflows/setupapp.yml | 4 ++++ 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/cleanup.yml diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml deleted file mode 100644 index f3d297286e..0000000000 --- a/.github/workflows/cleanup.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: cleanup-workflow - -on: - workflow_run: - workflows: - - "build" - types: ["requested"] - -jobs: - cancel-duplicated-workflow: - name: "Cancel duplicated workflow" - runs-on: ubuntu-latest - steps: - - uses: potiuk/cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738 # tested - name: "Cancel duplicate workflows" - with: - cancelMode: allDuplicates - token: ${{ secrets.GITHUB_TOKEN }} - sourceRunId: ${{ github.event.workflow_run.id }} - skipEventTypes: '["schedule"]' diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 48982a3809..64890cfda2 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -9,6 +9,10 @@ on: - releasing/* pull_request: +concurrency: + group: build-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: # caching of these jobs: # - docker-py3-pip- (shared) diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index 5c011a3af1..a647b06250 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -8,6 +8,10 @@ on: - main - releasing/* +concurrency: + group: deploy-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: # caching of these jobs: # - docker-py3-pip- (shared) From e652439f4d00604bfe4a0ebd1fd69030b3454390 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Sun, 30 May 2021 16:15:03 +0100 Subject: [PATCH 2/2] update docstring Signed-off-by: Wenqi Li --- .github/workflows/pythonapp.yml | 1 + .github/workflows/setupapp.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 64890cfda2..7e69e9995f 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -10,6 +10,7 @@ on: pull_request: concurrency: + # automatically cancel the previously triggered workflows when there's a newer version group: build-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index a647b06250..a575ec3ad6 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -9,6 +9,7 @@ on: - releasing/* concurrency: + # automatically cancel the previously triggered workflows when there's a newer version group: deploy-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true