From a5e9d1ef4d3b5d9f10c163efe0578d8693e49f25 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 27 Aug 2021 22:46:18 +0530 Subject: [PATCH 1/3] ci: concurrency control for CI jobs When same PR causes multiple CI triggers due to rapid addition of new commits, this change will cancel previous CI jobs to save resources. --- .github/workflows/server-mariadb-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 65b6666678..7c4d72b9fa 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -6,6 +6,11 @@ on: push: branches: [ develop ] +concurrency: + group: server-mariadb-${{ github.event.number }} + cancel-in-progress: true + + jobs: test: runs-on: ubuntu-18.04 From d0099985fcee57b7852ac6567c3c504a812cfe0e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 27 Aug 2021 23:04:37 +0530 Subject: [PATCH 2/3] ci: concurrency control for postgres --- .github/workflows/server-postgres-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index 17a0f6f94f..1539e8c2d5 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -4,6 +4,10 @@ on: pull_request: workflow_dispatch: +concurrency: + group: server-postgres-develop-${{ github.event.number }} + cancel-in-progress: true + jobs: test: runs-on: ubuntu-18.04 From 132864a77641fcfe233a25539a21bd1faf4cdc53 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 27 Aug 2021 23:08:09 +0530 Subject: [PATCH 3/3] ci: extend concurrency control to all long jobs --- .github/workflows/patch-mariadb-tests.yml | 5 +++++ .github/workflows/server-mariadb-tests.yml | 2 +- .github/workflows/ui-tests.yml | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index 6ccc059afb..0dd4cd51d8 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -2,6 +2,11 @@ name: Patch on: [pull_request, workflow_dispatch] + +concurrency: + group: patch-mariadb-develop-${{ github.event.number }} + cancel-in-progress: true + jobs: test: runs-on: ubuntu-18.04 diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 7c4d72b9fa..06977c7c2b 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -7,7 +7,7 @@ on: branches: [ develop ] concurrency: - group: server-mariadb-${{ github.event.number }} + group: server-mariadb-develop-${{ github.event.number }} cancel-in-progress: true diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index d56433c216..2a55546ec4 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -6,6 +6,10 @@ on: push: branches: [ develop ] +concurrency: + group: ui-develop-${{ github.event.number }} + cancel-in-progress: true + jobs: test: runs-on: ubuntu-18.04