From edb6bcc37030313d04ce4fb9ada5469ebde316b5 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Wed, 18 Nov 2026 17:23:18 +0800 Subject: [PATCH 1/3] CI: cancel superseded PR runs and stop rerunning on PR edits A new push to a PR now cancels the run still going for the old head, instead of letting it finish while the new run waits. This applies to build, build-dbg, behave and build-deb; build-deb had no concurrency group before and gets one. Pushes to main and REL_2_STABLE and manual runs are not cancelled. Editing a PR's title or description no longer starts the whole test matrix again: drop the "edited" trigger from build, build-dbg, build-deb and sqlancer. It was added so that a "[skip ci]" put into the PR text later would take effect, but such a skip leaves the required checks unreported and the PR unmergeable. Changing only a PR's base branch no longer reruns CI; push again or close and reopen the PR. --- .github/workflows/behave-cloudberry.yml | 2 +- .github/workflows/build-cloudberry.yml | 4 ++-- .github/workflows/build-dbg-cloudberry.yml | 4 ++-- .github/workflows/build-deb-cloudberry.yml | 6 +++++- .github/workflows/sqlancer-cloudberry.yml | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/behave-cloudberry.yml b/.github/workflows/behave-cloudberry.yml index e7b0ec3fc50..a40692abd64 100644 --- a/.github/workflows/behave-cloudberry.yml +++ b/.github/workflows/behave-cloudberry.yml @@ -82,7 +82,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false + cancel-in-progress: ${{ github.event_name == 'pull_request' }} permissions: contents: read diff --git a/.github/workflows/build-cloudberry.yml b/.github/workflows/build-cloudberry.yml index 976db9378fc..f6c8f9624b8 100644 --- a/.github/workflows/build-cloudberry.yml +++ b/.github/workflows/build-cloudberry.yml @@ -107,7 +107,7 @@ on: branches: [main, REL_2_STABLE] pull_request: branches: [main, REL_2_STABLE] - types: [opened, synchronize, reopened, edited] + types: [opened, synchronize, reopened] workflow_dispatch: inputs: rocky_version: @@ -128,7 +128,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false + cancel-in-progress: ${{ github.event_name == 'pull_request' }} # Note: Step details, logs, and artifacts require users to be logged into GitHub # even for public repositories. This is a GitHub security feature and cannot diff --git a/.github/workflows/build-dbg-cloudberry.yml b/.github/workflows/build-dbg-cloudberry.yml index b81bd12965b..6610a9f94c8 100644 --- a/.github/workflows/build-dbg-cloudberry.yml +++ b/.github/workflows/build-dbg-cloudberry.yml @@ -105,7 +105,7 @@ on: branches: [main, REL_2_STABLE] pull_request: branches: [main, REL_2_STABLE] - types: [opened, synchronize, reopened, edited] + types: [opened, synchronize, reopened] workflow_dispatch: inputs: test_selection: @@ -116,7 +116,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false + cancel-in-progress: ${{ github.event_name == 'pull_request' }} # Note: Step details, logs, and artifacts require users to be logged into GitHub # even for public repositories. This is a GitHub security feature and cannot diff --git a/.github/workflows/build-deb-cloudberry.yml b/.github/workflows/build-deb-cloudberry.yml index 5d873e72870..9ed492bae89 100644 --- a/.github/workflows/build-deb-cloudberry.yml +++ b/.github/workflows/build-deb-cloudberry.yml @@ -77,7 +77,7 @@ on: branches: [main, REL_2_STABLE] pull_request: branches: [main, REL_2_STABLE] - types: [opened, synchronize, reopened, edited] + types: [opened, synchronize, reopened] workflow_dispatch: # Manual trigger inputs: ubuntu_version: @@ -96,6 +96,10 @@ on: default: '' type: string +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + # Note: Step details, logs, and artifacts require users to be logged into GitHub # even for public repositories. This is a GitHub security feature and cannot # be overridden by permissions. diff --git a/.github/workflows/sqlancer-cloudberry.yml b/.github/workflows/sqlancer-cloudberry.yml index 76d7ec7c77c..0a6909ebfa7 100644 --- a/.github/workflows/sqlancer-cloudberry.yml +++ b/.github/workflows/sqlancer-cloudberry.yml @@ -54,7 +54,7 @@ on: branches: [main] pull_request: branches: [main] - types: [opened, synchronize, reopened, edited] + types: [opened, synchronize, reopened] workflow_dispatch: inputs: minutes_per_oracle: From c6bc408924c7e90d02b31eb06028cd2a2ca36b19 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Fri, 20 Nov 2026 16:25:47 +0800 Subject: [PATCH 2/3] Update .github/workflows/build-deb-cloudberry.yml Co-authored-by: Alena Rybakina <58230554+Alena0704@users.noreply.github.com> --- .github/workflows/build-deb-cloudberry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-cloudberry.yml b/.github/workflows/build-deb-cloudberry.yml index 9ed492bae89..f84c18cb55d 100644 --- a/.github/workflows/build-deb-cloudberry.yml +++ b/.github/workflows/build-deb-cloudberry.yml @@ -97,7 +97,7 @@ on: type: string concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} # Note: Step details, logs, and artifacts require users to be logged into GitHub From 1455bc2dfd9b2e7138433d00d8f4affb3b13c170 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Fri, 20 Nov 2026 16:28:34 +0800 Subject: [PATCH 3/3] CI: use per-PR or per-run concurrency groups in all PR workflows Apply the group that build-deb now uses to build, build-dbg and behave too. PR runs still share one group per PR and cancel superseded runs. Pushes to main and REL_2_STABLE and manual runs each get a group of their own, so a later run no longer drops a pending one from the queue. --- .github/workflows/behave-cloudberry.yml | 2 +- .github/workflows/build-cloudberry.yml | 2 +- .github/workflows/build-dbg-cloudberry.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/behave-cloudberry.yml b/.github/workflows/behave-cloudberry.yml index a40692abd64..d203281a7f5 100644 --- a/.github/workflows/behave-cloudberry.yml +++ b/.github/workflows/behave-cloudberry.yml @@ -81,7 +81,7 @@ on: type: string concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} permissions: diff --git a/.github/workflows/build-cloudberry.yml b/.github/workflows/build-cloudberry.yml index f6c8f9624b8..31816ad34d8 100644 --- a/.github/workflows/build-cloudberry.yml +++ b/.github/workflows/build-cloudberry.yml @@ -127,7 +127,7 @@ on: type: string concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} # Note: Step details, logs, and artifacts require users to be logged into GitHub diff --git a/.github/workflows/build-dbg-cloudberry.yml b/.github/workflows/build-dbg-cloudberry.yml index 6610a9f94c8..675e05e241d 100644 --- a/.github/workflows/build-dbg-cloudberry.yml +++ b/.github/workflows/build-dbg-cloudberry.yml @@ -115,7 +115,7 @@ on: type: string concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} # Note: Step details, logs, and artifacts require users to be logged into GitHub