From d6169de8cd6b528281965b2b597d3df8e7404130 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 11 Jun 2021 21:20:08 -0500 Subject: [PATCH 1/4] CI: enable auto-cancel for GitHub Actions --- .github/workflows/posix.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 3a4d3c106f851..bba69c57212a8 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -41,6 +41,9 @@ jobs: LC_ALL: ${{ matrix.settings[4] }} PANDAS_TESTING_MODE: ${{ matrix.settings[5] }} TEST_ARGS: ${{ matrix.settings[6] }} + concurrency: + group: ${{ matrix.settings[0] }} + cancel-in-progress: true steps: - name: Checkout From b718def2990cae73ee8c10b0451fa5aea76e93fd Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 11 Jun 2021 21:24:12 -0500 Subject: [PATCH 2/4] test auto-cancel --- .github/workflows/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index bba69c57212a8..5fe9061a21d20 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -45,6 +45,7 @@ jobs: group: ${{ matrix.settings[0] }} cancel-in-progress: true + steps: - name: Checkout uses: actions/checkout@v2 From 0a1ba34949b6d17022697ffb4dd44dfff6f27b26 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Sat, 12 Jun 2021 07:50:38 -0500 Subject: [PATCH 3/4] more auto-cancel --- .github/workflows/ci.yml | 18 +++++++++++++++--- .github/workflows/database.yml | 7 ++++++- .github/workflows/posix.yml | 6 +++--- .github/workflows/python-dev.yml | 4 ++++ 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5a802c678e20..cfdae016836f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,8 @@ name: CI on: push: - branches: [master] + branches: + - master pull_request: branches: - master @@ -20,6 +21,10 @@ jobs: run: shell: bash -l {0} + concurrency: + group: ${{ github.ref }}-checks + cancel-in-progress: true + steps: - name: Checkout uses: actions/checkout@v2 @@ -93,8 +98,12 @@ jobs: web_and_docs: name: Web and docs runs-on: ubuntu-latest - steps: + concurrency: + group: ${{ github.ref }}-web-docs + cancel-in-progress: true + + steps: - name: Checkout uses: actions/checkout@v2 with: @@ -148,8 +157,11 @@ jobs: strategy: matrix: pattern: ["not slow and not network and not clipboard", "slow"] - steps: + concurrency: + group: ${{ github.ref }}-data_manager-${{ matrix.pattern }} + cancel-in-progress: true + steps: - name: Checkout uses: actions/checkout@v2 with: diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index b15889351386a..3cc4c68ebeb8a 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -2,7 +2,8 @@ name: Database on: push: - branches: [master] + branches: + - master pull_request: branches: - master @@ -26,6 +27,10 @@ jobs: ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml] fail-fast: false + concurrency: + group: ${{ github.ref }}-${{ matrix.ENV_FILE }} + cancel-in-progress: true + services: mysql: image: mysql diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 5fe9061a21d20..67d90622bade9 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -2,7 +2,8 @@ name: Posix on: push: - branches: [master] + branches: + - master pull_request: branches: - master @@ -42,10 +43,9 @@ jobs: PANDAS_TESTING_MODE: ${{ matrix.settings[5] }} TEST_ARGS: ${{ matrix.settings[6] }} concurrency: - group: ${{ matrix.settings[0] }} + group: ${{ github.ref }}-${{ matrix.settings[0] }} cancel-in-progress: true - steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 2643dc5ec656e..ad3a98350a5a9 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -14,6 +14,10 @@ jobs: name: actions-310-dev timeout-minutes: 60 + concurrency: + group: ${{ github.ref }}-dev + cancel-in-progress: true + steps: - uses: actions/checkout@v2 with: From f922a8b255263c2a779199e3640e8c56c61bb9fd Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Sat, 12 Jun 2021 07:54:52 -0500 Subject: [PATCH 4/4] more auto-cancel --- .github/workflows/pre-commit.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 723347913ac38..dcb33b21a8ae1 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,11 +3,15 @@ name: pre-commit on: pull_request: push: - branches: [master] + branches: + - master jobs: pre-commit: runs-on: ubuntu-latest + concurrency: + group: ${{ github.ref }}-pre-commit + cancel-in-progress: true steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2