From 7101bb4ac3d9702e6fc6909b7f8163d3c12fc775 Mon Sep 17 00:00:00 2001 From: Yogeswaran K <166126056+yogeswaransky@users.noreply.github.com> Date: Mon, 29 Jun 2026 14:14:25 +0530 Subject: [PATCH 1/7] RDKE-1065: Using ubuntu-latest runner for release workflow (#557) --- .github/workflows/component-release-finish-on-approval.yml | 2 +- .github/workflows/component-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/component-release-finish-on-approval.yml b/.github/workflows/component-release-finish-on-approval.yml index 2050a947..27720f6f 100755 --- a/.github/workflows/component-release-finish-on-approval.yml +++ b/.github/workflows/component-release-finish-on-approval.yml @@ -19,7 +19,7 @@ jobs: github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'develop' && startsWith(github.event.pull_request.head.ref, 'release/') - runs-on: comcast-ubuntu-latest + runs-on: ubuntu-latest env: REPO: ${{ github.repository }} ACTOR: ${{ github.event.review.user.login }} diff --git a/.github/workflows/component-release.yml b/.github/workflows/component-release.yml index 54cada20..01913c2b 100755 --- a/.github/workflows/component-release.yml +++ b/.github/workflows/component-release.yml @@ -36,7 +36,7 @@ concurrency: jobs: release: - runs-on: comcast-ubuntu-latest + runs-on: ubuntu-latest env: RELEASE_VERSION: ${{ github.event.inputs.release_version }} RELEASE_TYPE: ${{ github.event.inputs.release_type }} From bccb0fec1bb9646a19a1e8be395018d79fe5bb67 Mon Sep 17 00:00:00 2001 From: Yogeswaran K <166126056+yogeswaransky@users.noreply.github.com> Date: Sun, 5 Jul 2026 16:27:36 +0530 Subject: [PATCH 2/7] RDKE-1065: Automated Component release workflow (#562) Signed-off-by: Yogeswaran K --- .../workflows/component-release-finish-on-approval.yml | 2 +- .github/workflows/component-release-workflow-usage.md | 8 +++++++- .github/workflows/component-release.yml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/component-release-finish-on-approval.yml b/.github/workflows/component-release-finish-on-approval.yml index 27720f6f..b414972f 100755 --- a/.github/workflows/component-release-finish-on-approval.yml +++ b/.github/workflows/component-release-finish-on-approval.yml @@ -23,7 +23,7 @@ jobs: env: REPO: ${{ github.repository }} ACTOR: ${{ github.event.review.user.login }} - GH_TOKEN: ${{ secrets.RDKCM_RDKE }} + GH_TOKEN: ${{ github.token }} RELEASE_BRANCH: ${{ github.event.pull_request.head.ref }} steps: diff --git a/.github/workflows/component-release-workflow-usage.md b/.github/workflows/component-release-workflow-usage.md index 2c62d0e3..9341e5e6 100755 --- a/.github/workflows/component-release-workflow-usage.md +++ b/.github/workflows/component-release-workflow-usage.md @@ -62,7 +62,13 @@ Triggered on approved review for `release/*` PRs targeting `develop`. Both workflows use: - `RDKCM_DEPLOY_KEY`: SSH private key used by checkout and git push operations. -- `RDKCM_RDKE`: token used by `gh` API/CLI calls. +- `github.token`: built-in GitHub Actions token used by `gh` API/CLI calls. + +Why `github.token`: + +- It is automatically provided for each workflow run. +- It avoids introducing a custom repository secret for API access. +- It works with the workflow permissions already declared in these jobs. ## Failure Cleanup Safety diff --git a/.github/workflows/component-release.yml b/.github/workflows/component-release.yml index 01913c2b..a0963aa2 100755 --- a/.github/workflows/component-release.yml +++ b/.github/workflows/component-release.yml @@ -44,7 +44,7 @@ jobs: SOURCE_BRANCH: ${{ github.event.inputs.source_branch }} REPO: ${{ github.repository }} ACTOR: ${{ github.actor }} - GH_TOKEN: ${{ secrets.RDKCM_RDKE }} + GH_TOKEN: ${{ github.token }} steps: - name: Validate version format From 400a9c404b649a64982be73b352d9b55eec20a3b Mon Sep 17 00:00:00 2001 From: apatel859 <48992974+apatel859@users.noreply.github.com> Date: Tue, 7 Jul 2026 14:35:22 -0400 Subject: [PATCH 3/7] RDKEMW-21159: avoid thermal call in deepsleep (#548) (#566) * RDKEMW-21159: avoid thermal call in deepsleep * Apply suggestions from code review --------- Signed-off-by: apatel859 Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- lib/rdk/temperature-telemetry.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/rdk/temperature-telemetry.sh b/lib/rdk/temperature-telemetry.sh index f2841cdc..dd6a33d5 100644 --- a/lib/rdk/temperature-telemetry.sh +++ b/lib/rdk/temperature-telemetry.sh @@ -21,7 +21,14 @@ if [ -f /lib/rdk/t2Shared_api.sh ]; then source /lib/rdk/t2Shared_api.sh fi -boardTemp=`/bin/cat /sys/class/thermal/thermal_zone0/temp | sed 's/./&./2'`c + +powerState=$(/usr/bin/QueryPowerState) + +if [ "$powerState" != "DEEPSLEEP" ]; then + boardTemp=`/bin/cat /sys/class/thermal/thermal_zone0/temp | sed 's/./&./2'`c +else + boardTemp="Device in Deepsleep" +fi /bin/echo Temperature:$boardTemp t2ValNotify "Board_temperature_split" "$boardTemp" From 466eb9f7ff839781f4f9b31f810567bfa2f4ea07 Mon Sep 17 00:00:00 2001 From: Leena D <74546271+leenaS-d@users.noreply.github.com> Date: Wed, 15 Jul 2026 09:50:55 -0400 Subject: [PATCH 4/7] RDKEMW-10439: Reboot device with WareHouse plugin resetDevice (#381) --- lib/rdk/factory-reset.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/rdk/factory-reset.sh b/lib/rdk/factory-reset.sh index dabdbb1a..e294363b 100755 --- a/lib/rdk/factory-reset.sh +++ b/lib/rdk/factory-reset.sh @@ -48,7 +48,6 @@ if [ -f /etc/os-release ];then /bin/systemctl stop dump-backup.service /bin/systemctl stop dnsmasq.service /bin/systemctl stop syslog.socket - /bin/systemctl stop wpeframework.service if [ "$DOBBY_ENABLED" == "true" ]; then /bin/systemctl stop dobby.service fi From 21a9fbb67d026ac070719a964d77966a67367c87 Mon Sep 17 00:00:00 2001 From: madhubabutt <114217841+madhubabutt@users.noreply.github.com> Date: Wed, 15 Jul 2026 19:40:19 +0530 Subject: [PATCH 5/7] RDKEMW-20916 : [RDKE] [Develop] RDKV-to-RDKE Migration: Unexpected Network Connectivity Prior to Migration Completion (#571) Co-authored-by: mtirum011 --- systemd_units/NetworkManager_ecfs.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd_units/NetworkManager_ecfs.conf b/systemd_units/NetworkManager_ecfs.conf index dcf4079f..a47863c4 100644 --- a/systemd_units/NetworkManager_ecfs.conf +++ b/systemd_units/NetworkManager_ecfs.conf @@ -1,2 +1,3 @@ [Unit] -After=securemount.service +After=securemount.service bootversion-loader.service +Wants=bootversion-loader.service From dc529e8026e8e3f2bf966aaab9bda5a9c0afb096 Mon Sep 17 00:00:00 2001 From: Yogeswaran K <166126056+yogeswaransky@users.noreply.github.com> Date: Mon, 20 Jul 2026 13:19:59 +0530 Subject: [PATCH 6/7] RDKE-1065: Automated workflow - create pull request to main instead of develop (#572) Signed-off-by: Yogeswaran K --- .../workflows/component-release-finish-on-approval.yml | 2 +- .github/workflows/component-release-workflow-usage.md | 7 ++++--- .github/workflows/component-release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/component-release-finish-on-approval.yml b/.github/workflows/component-release-finish-on-approval.yml index b414972f..2fd54a7e 100755 --- a/.github/workflows/component-release-finish-on-approval.yml +++ b/.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: diff --git a/.github/workflows/component-release-workflow-usage.md b/.github/workflows/component-release-workflow-usage.md index 9341e5e6..35c3b7f8 100755 --- a/.github/workflows/component-release-workflow-usage.md +++ b/.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/` -> `develop`. +3. Creates a PR: `release/` -> `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/` branch. +6. Closes the release PR. ## Authentication and Secrets diff --git a/.github/workflows/component-release.yml b/.github/workflows/component-release.yml index a0963aa2..e73c82d7 100755 --- a/.github/workflows/component-release.yml +++ b/.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 # From 658364b56e7ee794ff8f53b1fa88106a6e8ae007 Mon Sep 17 00:00:00 2001 From: yogeswaransky Date: Mon, 20 Jul 2026 07:51:37 +0000 Subject: [PATCH 7/7] 6.0.1 release changelog updates --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47c75f36..462a1d86 100644 --- a/CHANGELOG.md +++ b/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)