Skip to content

fix(ci): preserve in-progress runs on release/* branches#4883

Merged
Yicong-Huang merged 3 commits into
apache:mainfrom
Yicong-Huang:fix/ci-no-cancel-on-release-branch
May 4, 2026
Merged

fix(ci): preserve in-progress runs on release/* branches#4883
Yicong-Huang merged 3 commits into
apache:mainfrom
Yicong-Huang:fix/ci-no-cancel-on-release-branch

Conversation

@Yicong-Huang
Copy link
Copy Markdown
Contributor

@Yicong-Huang Yicong-Huang commented May 4, 2026

What changes were proposed in this PR?

Extend the cancel-in-progress exemption in required-checks.yml so it covers release/** branches in addition to main. Both branches show up in the push: trigger and share the same "production" risk profile — a back-to-back push (e.g. when a backport applies a follow-up commit) currently cancels the prior in-progress run mid-flight, leaving release branches with incomplete CI signal.

cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release/') }}

PR head (feature branches), ci-enable/**, and workflow_dispatch on non-protected refs continue to cancel-in-progress as before.

Any related issues, documentation, discussions?

Closes #4882

How was this PR tested?

The change is a single-line GitHub expression edit; static-validated by python3 -c 'import yaml; yaml.safe_load(open(...))'. Behavior is contract-tested by GitHub's expression engine semantics (the existing ${{ github.ref != 'refs/heads/main' }} form is just being conjoined with a startsWith check). Manual end-to-end verification will be done after merge by pushing two commits back-to-back to a release/* branch and confirming the first run completes instead of being cancelled.

Was this PR authored or co-authored using generative AI tooling?

Generated-by: Claude Code (Opus 4.7)

Previously cancel-in-progress was only disabled for main, so a
back-to-back push to release/v1.1.0-incubating cancelled the prior
run mid-flight and left release branches with partial CI signal.
Release branches share main's "production" risk profile, so apply
the same exemption.

Closes apache#4882
@github-actions github-actions Bot added fix ci changes related to CI labels May 4, 2026
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 4, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 43.13%. Comparing base (3353321) to head (424e659).

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #4883      +/-   ##
============================================
+ Coverage     42.39%   43.13%   +0.74%     
- Complexity     2155     2222      +67     
============================================
  Files           954     1000      +46     
  Lines         34694    39257    +4563     
  Branches       3629     4541     +912     
============================================
+ Hits          14707    16935    +2228     
- Misses        19083    21072    +1989     
- Partials        904     1250     +346     
Flag Coverage Δ
access-control-service 36.36% <ø> (-3.18%) ⬇️
agent-service 33.49% <ø> (-0.24%) ⬇️
amber 43.02% <ø> (+0.22%) ⬆️
computing-unit-managing-service 0.00% <ø> (ø)
config-service 0.00% <ø> (ø)
file-service 32.40% <ø> (-0.85%) ⬇️
frontend 34.30% <ø> (+4.33%) ⬆️
python 87.42% <ø> (+<0.01%) ⬆️
workflow-compiling-service 47.72% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Yicong-Huang Yicong-Huang added the release/v1.1.0-incubating back porting to release/v1.1.0-incubating label May 4, 2026
@Yicong-Huang Yicong-Huang requested a review from bobbai00 May 4, 2026 01:10
@Yicong-Huang Yicong-Huang enabled auto-merge (squash) May 4, 2026 02:06
@aglinxinyuan aglinxinyuan requested a review from Copilot May 4, 2026 02:56
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the Required Checks GitHub Actions workflow concurrency settings so that CI runs on release/** branches are not cancelled when multiple commits are pushed in quick succession, matching the existing behavior for main and preserving full CI signal on production-risk branches.

Changes:

  • Extend the concurrency.cancel-in-progress exemption from only main to also include release/** branches.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@Yicong-Huang Yicong-Huang requested a review from aglinxinyuan May 4, 2026 03:07
Copy link
Copy Markdown
Contributor

@kunwp1 kunwp1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Yicong-Huang Yicong-Huang merged commit 332d4f4 into apache:main May 4, 2026
39 checks passed
@Yicong-Huang Yicong-Huang deleted the fix/ci-no-cancel-on-release-branch branch May 4, 2026 05:22
Yicong-Huang added a commit that referenced this pull request May 4, 2026
### What changes were proposed in this PR?

Extend the `cancel-in-progress` exemption in `required-checks.yml` so it
covers `release/**` branches in addition to `main`. Both branches show
up in the `push:` trigger and share the same "production" risk profile —
a back-to-back push (e.g. when a backport applies a follow-up commit)
currently cancels the prior in-progress run mid-flight, leaving release
branches with incomplete CI signal.

```yaml
cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release/') }}
```

PR head (feature branches), `ci-enable/**`, and `workflow_dispatch` on
non-protected refs continue to cancel-in-progress as before.

### Any related issues, documentation, discussions?

Closes #4882

### How was this PR tested?

The change is a single-line GitHub expression edit; static-validated by
`python3 -c 'import yaml; yaml.safe_load(open(...))'`. Behavior is
contract-tested by GitHub's expression engine semantics (the existing
`${{ github.ref != 'refs/heads/main' }}` form is just being conjoined
with a `startsWith` check). Manual end-to-end verification will be done
after merge by pushing two commits back-to-back to a `release/*` branch
and confirming the first run completes instead of being cancelled.

### Was this PR authored or co-authored using generative AI tooling?

(backported from commit 332d4f4)

Generated-by: Claude Code (Opus 4.7)
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 4, 2026

Backport to release/v1.1.0-incubating succeeded as 666b3fe. Run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci changes related to CI fix release/v1.1.0-incubating back porting to release/v1.1.0-incubating

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Required Checks workflow cancels in-progress runs on release/* branches

5 participants