Rebase

.github/workflows/component-release-finish-on-approval.yml

@@ -17,7 +17,7 @@ jobs:
     name: Finish release when PR is approved
     if: >
       github.event.review.state == 'approved' &&
-      github.event.pull_request.base.ref == 'develop' &&
+      github.event.pull_request.base.ref == 'main' &&
       startsWith(github.event.pull_request.head.ref, 'release/')
     runs-on: ubuntu-latest
     env:

.github/workflows/component-release-workflow-usage.md

@@ -35,7 +35,7 @@ This prevents two runs for the same version/type from racing on branches/tags.
 **Main release - approvable**
 1. Validates version format.
 2. Runs `git flow release start` -> changelog -> `release publish`.
-3. Creates a PR: `release/<version>` -> `develop`.
+3. Creates a PR: `release/<version>` -> `main`.
 4. Stops and waits for PR approval.
 5. On approval, the second workflow finishes the release.
 
@@ -48,14 +48,15 @@ This prevents two runs for the same version/type from racing on branches/tags.
 
 ### 2. Component Release Finish On Approval (`component-release-finish-on-approval.yml`)
 
-Triggered on approved review for `release/*` PRs targeting `develop`.
+Triggered on approved review for `release/*` PRs targeting `main`.
 
 #### What it does
 1. Verifies PR review decision is `APPROVED`.
 2. Checks out release branch.
 3. Runs `git flow release finish` (merge to `main` + `develop`, create tag).
 4. Pushes `main`, `develop`, and tags.
-5. Closes the release PR.
+5. Deletes remote `release/<version>` branch.
+6. Closes the release PR.
 
 ## Authentication and Secrets
 

.github/workflows/component-release.yml

@@ -119,7 +119,7 @@ jobs:
           git push origin main
           git push origin --tags
           git push origin develop
-            git push origin --delete "release/${RELEASE_VERSION}" || true
+          git push origin --delete "release/${RELEASE_VERSION}" || true
 
       #
       # ── APPROVABLE RELEASE ──
@@ -148,16 +148,16 @@ jobs:
             git flow release publish "${RELEASE_VERSION}"
           fi
 
-          existing_pr=$(gh pr list --head "${release_branch}" --base develop --state open --json number -q '.[0].number')
+          existing_pr=$(gh pr list --head "${release_branch}" --base main --state open --json number -q '.[0].number')
           if [ -z "${existing_pr}" ]; then
             gh pr create \
-              --base develop \
+              --base main \
               --head "${release_branch}" \
               --title "Release ${RELEASE_VERSION}" \
               --body "Automated release PR for ${RELEASE_VERSION}. Approve this PR to trigger release finish."
             echo "PR created. Waiting for approval to finish release."
           else
-            echo "PR from ${release_branch} to develop already exists (#${existing_pr})."
+            echo "PR from ${release_branch} to main already exists (#${existing_pr})."
           fi
 
       #

CHANGELOG.md

@@ -4,9 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [6.0.0](https://github.com/rdkcentral/sysint/compare/5.1.0...6.0.0)
+#### [6.0.1](https://github.com/rdkcentral/sysint/compare/6.0.0...6.0.1)
+
+- RDKE-1065: Automated workflow - create pull request to main instead of develop [`#572`](https://github.com/rdkcentral/sysint/pull/572)
+- RDKEMW-20916 : [RDKE] [Develop] RDKV-to-RDKE Migration: Unexpected Network Connectivity Prior to Migration Completion [`#571`](https://github.com/rdkcentral/sysint/pull/571)
+- RDKEMW-10439: Reboot device with WareHouse plugin resetDevice [`#381`](https://github.com/rdkcentral/sysint/pull/381)
+- RDKEMW-21159: avoid thermal call in deepsleep (#548) [`#566`](https://github.com/rdkcentral/sysint/pull/566)
+- RDKE-1065: Automated Component release workflow [`#562`](https://github.com/rdkcentral/sysint/pull/562)
+- RDKE-1065: Using ubuntu-latest runner for release workflow [`#557`](https://github.com/rdkcentral/sysint/pull/557)
+- Merge tag '6.0.0' into develop [`e96c345`](https://github.com/rdkcentral/sysint/commit/e96c34560bc16714dec958463ebf64772902f45d)
+
+### [6.0.0](https://github.com/rdkcentral/sysint/compare/5.1.0...6.0.0)
+
+> 29 June 2026
 
 - RDKE-1065: Automated Component Release workflow [`#553`](https://github.com/rdkcentral/sysint/pull/553)
+- 6.0.0 release changelog updates [`58e2d19`](https://github.com/rdkcentral/sysint/commit/58e2d19f3d246800212a97f5bd95aeeb923fa4be)
 - Merge tag '5.1.0' into develop [`4e51a4f`](https://github.com/rdkcentral/sysint/commit/4e51a4f92b24157d5062264fde85c9469242494f)
 
 #### [5.1.0](https://github.com/rdkcentral/sysint/compare/5.0.2...5.1.0)