From 99190bdcb75258e5413bb04f890fd613a21ea245 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Wed, 20 Aug 2025 13:09:13 -0300 Subject: [PATCH] Fix CI concurrency group evaluation error for master builds (#33756) Replace empty string fallback with github.run_id to prevent workflow evaluation errors when concurrency group evaluates to empty string on non-pull-request events. --- .github/workflows/server-ci.yml | 2 +- .github/workflows/webapp-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml index e927160997a..6755f9a2e68 100644 --- a/.github/workflows/server-ci.yml +++ b/.github/workflows/server-ci.yml @@ -13,7 +13,7 @@ on: - ".github/workflows/mmctl-test-template.yml" concurrency: - group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow, github.ref) || '' }} + group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow, github.ref) || github.run_id }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: diff --git a/.github/workflows/webapp-ci.yml b/.github/workflows/webapp-ci.yml index a31f8511536..70e61cf0ccf 100644 --- a/.github/workflows/webapp-ci.yml +++ b/.github/workflows/webapp-ci.yml @@ -12,7 +12,7 @@ on: - ".github/actions/webapp-setup/**" concurrency: - group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow, github.ref) || '' }} + group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow, github.ref) || github.run_id }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: