Skip to content

RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.1.2) - #492

Merged
brendanobra merged 5 commits into
developfrom
ci/onboard-sync-automation-unknown
Oct 14, 2026
Merged

brendanobra merged 5 commits into
developfrom
ci/onboard-sync-automation-unknown

Conversation

@brendanobra

Copy link
Copy Markdown
Contributor

Description

What does this PR change/fix and why?

If there is a corresponding JIRA ticket, please ensure it is in the title of the PR.

Test Procedure

How to test this PR (if applicable)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • [ X] Other (doesn't fit into the above categories - e.g. documentation updates)
    Automation fo manual process (merge develop -> main)

Requires Bitbake Recipe changes?

  • The base Bitbake recipe (meta-rdk-ext/recipes-containers/dobby/dobby.bb) must be modified to support the changes in this PR (beyond updating SRC_REV)

Copilot AI balanced review requested due to automatic review settings October 12, 2026 17:56

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

Fallback updates can lose or omit commits, while the configured token prevents synchronized pushes and PRs from triggering CI.

4 open findings
What changed in this PR

Onboards sync automation v1.2.0 to merge develop into main with fallback PR and issue handling.

Changes:

  • Adds the synchronization workflow and reusable action.
  • Adds internal and OSS consumer templates.
  • Adds bundle metadata, documentation, changelog, and tagging utility.
File Description
.github/​workflows/​sync-develop-to-main.yml Runs the repository synchronization workflow.
.github/​automation-install.lock.json Records bundle version and verified file hashes.
.github/​actions/​sync-branches/​action.yml Implements merge and fallback handling.
.github/​actions/​sync-branches/​consumer-template.yml Provides the internal consumer template.
.github/​actions/​sync-branches/​consumer-template-oss.yml Provides the OSS installation template.
.github/​actions/​sync-branches/​README.md Documents configuration and behavior.
.github/​actions/​sync-branches/​CHANGELOG.md Records action changes.
.github/​actions/​sync-branches/​scripts/​move-major-tag.sh Updates the floating release tag.

🧠 Review effort: Balanced


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

Comment thread .github/actions/sync-branches/action.yml Outdated
Comment thread .github/actions/sync-branches/consumer-template-oss.yml Outdated
Comment thread .github/actions/sync-branches/consumer-template.yml Outdated
Comment thread .github/workflows/sync-develop-to-main.yml Outdated
The previously committed bundle on this branch was built locally with
an ad hoc version string (1.2.0) that was never an actual published
release and predates the actions-v1.1.0 fixes (fallback PR branches
keyed by source commit, stale fallback PR cleanup, GITHUB_TOKEN
limitation docs). Replace it with the officially released
actions-v1.1.0 bundle from rdk-e/app-gateway-automation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 12, 2026 22:31
@brendanobra brendanobra changed the title RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.2.0) RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.1.0) Oct 12, 2026

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.

Comment thread .github/actions/sync-branches/action.yml Outdated
Comment thread .github/automation-install.lock.json Outdated
Comment thread .github/actions/sync-branches/README.md
Comment thread .github/actions/sync-branches/README.md
Fixes the fallback issue manual-merge checklist, which previously told
responders to merge source_branch into the fallback branch (a no-op
since the fallback branch is created directly from that source
commit). It now correctly instructs merging target_branch instead.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 12, 2026 22:48
@brendanobra brendanobra changed the title RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.1.0) RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.1.1) Oct 12, 2026

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.

🔵 Needs a closer look

Invalid failure-policy values can silently disable failures, and documented permissions are insufficient for fallback issue handling.

0 open findings

4 resolved since last review
Previously missed (2)

In code that hasn't changed since last review

Medium severity Reject unknown fail_on_human_intervention values

.github/​actions/​sync-branches/​action.yml:598

Any value other than true, 1, or yes currently disables failure, so a typo such as ture makes a merge-conflict run succeed despite the safety-oriented default. Accept only the documented true/false values (or fail closed on unknown values) before deciding the exit status.

This issue also appears on line 622 of the same file.

Low severity Handle missing option value before dereferencing $2

.github/​actions/​sync-branches/​scripts/​move-major-tag.sh:14

Invoking the documented option without a value dereferences $2 under set -u, producing an unhelpful unbound variable failure instead of the usage error below. Check that a non-empty second argument exists before assigning VERSION, and reject the malformed invocation explicitly.

🧠 Review effort: Balanced

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

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

Existing label metadata can be overwritten, and documented permission examples omit required issue access.

1 open finding

🧠 Review effort: Balanced

Comment thread .github/actions/sync-branches/action.yml Outdated
Drops --force from the label-ensure step's gh label create call so
re-running the fallback path no longer overwrites an existing label's
color/description; the trailing || true still treats non-existence as
non-fatal.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 13, 2026 20:35
@brendanobra brendanobra changed the title RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.1.1) RDKEMW-15981: ci - onboard sync-develop-to-main automation (1.1.2) Oct 13, 2026

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.

🔵 Needs a closer look

Existing fallback PRs ignore label and reviewer configuration, and documented permission examples can fail during issue fallback.

0 open findings

1 resolved since last review
Previously missed (2)

In code that hasn't changed since last review

Medium severity Publish workspace path before fallible setup commands

.github/​actions/​sync-branches/​action.yml:146

Publish path immediately after mktemp -d. If clone, checkout, or remote setup fails before line 146, the always-running cleanup step receives no workspace path and leaves this directory behind; this accumulates repository data on the self-hosted runner used by the reference template. Reordering the output before the fallible commands lets cleanup remove partial workspaces; regenerate the lock hash afterward.

Medium severity Apply labels and reviewers when updating existing fallback PRs

.github/​actions/​sync-branches/​action.yml:379

Retries for the same source SHA take this branch and exit after changing only the title/body, so pr_labels and assign_reviewers are never applied to an existing fallback PR. A configuration change—or a manually removed label—therefore has no effect even though the action advertises updating fallback PRs. Build the edit command with --add-label and --add-reviewer from the two inputs before returning, then regenerate the managed-file hash in the lock file.

🧠 Review effort: Balanced

@brendanobra
brendanobra merged commit f6f8d35 into develop Oct 14, 2026
26 checks passed
@brendanobra
brendanobra deleted the ci/onboard-sync-automation-unknown branch October 14, 2026 15:35
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 14, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants