Skip to content

chore: auto-sync develop → main (direct push failure) - #141

Open
swethasukumarr wants to merge 3 commits into
mainfrom
auto-sync/develop-to-main-37822199915
Open

swethasukumarr wants to merge 3 commits into
mainfrom
auto-sync/develop-to-main-37822199915

Conversation

@swethasukumarr

Copy link
Copy Markdown
Contributor

Automatic sync of develop → main could not complete via direct workflow push.

Action required: resolve the conflicts in this PR, then merge it.

Detected reason: direct push failure

Triggered by: 374f09a on develop

Copilot AI balanced review requested due to automatic review settings October 8, 2026 18:10

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟡 Changes recommended

Release-branch validation permits mismatched versions, and the changelog removes documented RC history.

2 open findings
What changed in this PR

Synchronizes release updates from develop into main and hardens the release workflow.

Changes:

  • Promotes the changelog entry to version 1.1.12.
  • Adds branch, changelog, concurrency, and existing-tag safeguards.
File Description
CHANGELOG.md Updates the latest release heading.
.github/​workflows/​release.yml Strengthens release validation and retry safety.

🧠 Review effort: Balanced


💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment on lines +49 to +53
branch="${GITHUB_REF_NAME}"
if [[ "$branch" == "main" || "$branch" =~ ^[0-9]+\.[0-9]+(-rc|\.x-maintenance)$ ]]; then
echo "Release allowed from branch: $branch"
else
echo "Release blocked: branch '$branch' is not allowed. Use 'main', an 'N.N-rc' branch, or an 'N.N.x-maintenance' branch."
Comment thread CHANGELOG.md
@@ -1,4 +1,4 @@
## [1.1.12.rc1](https://github.com/rdkcentral/firebolt-cpp-transport/compare/v1.1.11...v1.1.12.rc1)
## [1.1.12](https://github.com/rdkcentral/firebolt-cpp-transport/compare/v1.1.11...v1.1.12)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants