From 4d1fa2cadbeb79d38feb80b2fd4f8b640e11e378 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Sun, 30 Jan 2022 15:55:14 +0100 Subject: [PATCH 01/10] concurrency ci --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 74603d4398f..ebe1401d045 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,10 @@ on: - "*" workflow_dispatch: # allows you to trigger manually +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: skip-duplicate-jobs: runs-on: ubuntu-latest From 0c93f0ac764124a8e8ebbbc7db839f92d14ed8ad Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Sun, 30 Jan 2022 15:57:47 +0100 Subject: [PATCH 02/10] Update ci-additional.yaml --- .github/workflows/ci-additional.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 3fbe1e2f460..57d569e8e87 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -8,6 +8,10 @@ on: - "*" workflow_dispatch: # allows you to trigger manually +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: skip-duplicate-jobs: runs-on: ubuntu-latest From 65056d523eea39f1ca41fa49b05be52e97f38d72 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Sun, 30 Jan 2022 15:59:03 +0100 Subject: [PATCH 03/10] Update upstream-dev-ci.yaml --- .github/workflows/upstream-dev-ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 67415331bbd..7f2bdea87ba 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -10,6 +10,10 @@ on: - cron: "0 0 * * *" # Daily “At 00:00” UTC workflow_dispatch: # allows you to trigger the workflow run manually +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: detect-ci-trigger: name: detect upstream-dev ci trigger From ecc0346016494484068bf6ef64910e1d0f42312c Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Sun, 30 Jan 2022 16:04:08 +0100 Subject: [PATCH 04/10] Delete cancel-duplicate-runs.yaml --- .github/workflows/cancel-duplicate-runs.yaml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/workflows/cancel-duplicate-runs.yaml diff --git a/.github/workflows/cancel-duplicate-runs.yaml b/.github/workflows/cancel-duplicate-runs.yaml deleted file mode 100644 index 9f74360b034..00000000000 --- a/.github/workflows/cancel-duplicate-runs.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: Cancel -on: - workflow_run: - workflows: ["CI", "CI Additional", "CI Upstream"] - types: - - requested -jobs: - cancel: - name: Cancel previous runs - runs-on: ubuntu-latest - if: github.repository == 'pydata/xarray' - steps: - - uses: styfle/cancel-workflow-action@0.9.1 - with: - workflow_id: ${{ github.event.workflow.id }} From 0ad42783cc4c3135e58bdc0f9fa0a82bb4febf09 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Mon, 31 Jan 2022 10:43:15 +0100 Subject: [PATCH 05/10] Update ci.yaml --- .github/workflows/ci.yaml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ebe1401d045..dff4af83fb2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,26 +13,8 @@ concurrency: cancel-in-progress: true jobs: - skip-duplicate-jobs: - runs-on: ubuntu-latest - if: | - github.repository == 'pydata/xarray' - && (github.event_name == 'push' || github.event_name == 'pull_request') - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@v3.4.1 - with: - # For workflows which are triggered concurrently with the same - # contents, attempt to execute them exactly once. - concurrent_skipping: 'same_content_newer' - paths_ignore: '["**/doc/**"]' - detect-ci-trigger: name: detect ci trigger - needs: skip-duplicate-jobs - if: ${{ needs.skip-duplicate-jobs.outputs.should_skip != 'true' }} runs-on: ubuntu-latest outputs: triggered: ${{ steps.detect-trigger.outputs.trigger-found }} @@ -129,7 +111,6 @@ jobs: event_file: name: "Event File" - needs: skip-duplicate-jobs if: ${{ needs.skip-duplicate-jobs.outputs.should_skip != 'true' }} runs-on: ubuntu-latest steps: From d1f79bdf9703a3e8b81dad87ec7965b03c6027d4 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Mon, 31 Jan 2022 10:44:50 +0100 Subject: [PATCH 06/10] Update ci-additional.yaml --- .github/workflows/ci-additional.yaml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 57d569e8e87..ca0143aaaae 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -13,26 +13,9 @@ concurrency: cancel-in-progress: true jobs: - skip-duplicate-jobs: - runs-on: ubuntu-latest - if: | - github.repository == 'pydata/xarray' - && (github.event_name == 'push' || github.event_name == 'pull_request') - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@v3.4.1 - with: - # For workflows which are triggered concurrently with the same - # contents, attempt to execute them exactly once. - concurrent_skipping: 'same_content_newer' - paths_ignore: '["**/doc/**"]' detect-ci-trigger: name: detect ci trigger runs-on: ubuntu-latest - needs: skip-duplicate-jobs - if: ${{ needs.skip-duplicate-jobs.outputs.should_skip != 'true' }} outputs: triggered: ${{ steps.detect-trigger.outputs.trigger-found }} steps: @@ -133,8 +116,6 @@ jobs: doctest: name: Doctests runs-on: "ubuntu-latest" - needs: skip-duplicate-jobs - if: ${{ needs.skip-duplicate-jobs.outputs.should_skip != 'true' }} defaults: run: shell: bash -l {0} From b554b86b4172736ebd1788efb57d7b43907643cf Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Mon, 31 Jan 2022 10:47:55 +0100 Subject: [PATCH 07/10] Update ci.yaml --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dff4af83fb2..a69d9556d29 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -111,7 +111,6 @@ jobs: event_file: name: "Event File" - if: ${{ needs.skip-duplicate-jobs.outputs.should_skip != 'true' }} runs-on: ubuntu-latest steps: - name: Upload From 06a168f772d2e95b6146187a7fae75ab97936350 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Mon, 31 Jan 2022 11:08:26 +0100 Subject: [PATCH 08/10] Update .github/workflows/ci-additional.yaml --- .github/workflows/ci-additional.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index ca0143aaaae..2be3577d883 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -8,7 +8,7 @@ on: - "*" workflow_dispatch: # allows you to trigger manually -concurrency: +concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true From 99128f6f3451ffca79598e549bf9a4277c89c8f0 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Mon, 31 Jan 2022 11:08:51 +0100 Subject: [PATCH 09/10] Update .github/workflows/ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a69d9556d29..c11842bbb04 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: - "*" workflow_dispatch: # allows you to trigger manually -concurrency: +concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true From cff230acc15fb27658c145a664c5563d296d750d Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Mon, 31 Jan 2022 11:09:00 +0100 Subject: [PATCH 10/10] Update .github/workflows/upstream-dev-ci.yaml --- .github/workflows/upstream-dev-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 7f2bdea87ba..f1ce442c623 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -10,7 +10,7 @@ on: - cron: "0 0 * * *" # Daily “At 00:00” UTC workflow_dispatch: # allows you to trigger the workflow run manually -concurrency: +concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true