Skip to content

github: workflows: Use semver and timestamp suffixes to distinguish branches - #12016

Merged
patrick-stephens merged 1 commit into
masterfrom
cosmo0920-use-alternate-branch-strategy
Jun 29, 2026
Merged

github: workflows: Use semver and timestamp suffixes to distinguish branches#12016
patrick-stephens merged 1 commit into
masterfrom
cosmo0920-use-alternate-branch-strategy

Conversation

@cosmo0920

@cosmo0920 cosmo0920 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

Summary by CodeRabbit

  • Chores
    • Improved automated version update PR creation so each run uses a consistent branch name and avoids branch-name collisions.
    • This helps keep release automation more reliable and reduces the chance of duplicate or conflicting update PRs.

…ranches

Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
@coderabbitai

coderabbitai Bot commented Jun 29, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: ddb73431-a6ad-49e9-9f4b-ef1822c1a2b4

📥 Commits

Reviewing files that changed from the base of the PR and between f317143 and 97801f7.

📒 Files selected for processing (1)
  • .github/workflows/staging-release.yaml

📝 Walkthrough

Walkthrough

In the staging-release-create-version-update-pr job, the "Raise FB PR to update version" step now sets a deterministic branch name incorporating the computed patch version and adds branch-suffix: timestamp to ensure uniqueness per workflow run.

Changes

Staging Release Workflow Branch Naming

Layer / File(s) Summary
create-pull-request branch inputs
.github/workflows/staging-release.yaml
Adds branch (with patch version) and branch-suffix: timestamp inputs to the create-pull-request action step, making PR branch names deterministic per version and unique per run.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Possibly related PRs

  • fluent/fluent-bit#10712: Modifies the same staging-release-create-version-update-pr job in .github/workflows/staging-release.yaml, adjusting branch/ref logic for version-updating pull requests.

Suggested reviewers

  • niedbalski
  • celalettin1286
  • patrick-stephens

🐇 A branch with a name, timestamped with care,
No more collisions floating in the air.
Patch version baked in, suffix too,
Each workflow run gets something new.
Hop hop hooray for tidy CI queues! 🎉

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title matches the workflow change by describing semver-based branch naming and timestamp suffixes to distinguish branches.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch cosmo0920-use-alternate-branch-strategy

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@patrick-stephens
patrick-stephens merged commit a9b9f04 into master Jun 29, 2026
21 checks passed
@patrick-stephens
patrick-stephens deleted the cosmo0920-use-alternate-branch-strategy branch June 29, 2026 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants