Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brendanobra wants to merge 15 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9000896
Merge pull request #103 from rdkcentral/main
brendanobra Jul 15, 2026
f92dd9f
RDKEMW-19316 : Add coding guidelines for firebolt-cpp-transport
swethasukumarr Jul 14, 2026
a38dfc8
RDKEMW-19316 : Address copilot comments
swethasukumarr Jul 15, 2026
236ebea
RDKEMW-19316 : Verify and expand coding guidelines
swethasukumarr Jul 16, 2026
6f29492
RDKEMW-19316 : Address copilot comments
swethasukumarr Jul 16, 2026
3ac59b1
RDKEMW-19316 : Address copilot comments
swethasukumarr Jul 16, 2026
8b110d2
RDKEMW-19316 : Address copilot comments
swethasukumarr Jul 16, 2026
f12098d
RDKEMW-19316 : Fix headers
swethasukumarr Jul 16, 2026
7a58ea3
RDKEMW-19316 : Fix comments
swethasukumarr Jul 16, 2026
fd83067
RDKEMW-19316 : Fix comments
swethasukumarr Jul 16, 2026
f81f48c
Merge pull request #102 from rdkcentral/feature/RDKEMW-19316
swethasukumarr Jul 21, 2026
375365e
Replace SubscriptionData value map with shared_ptr; drop stale notifi…
swethasukumarr Jul 22, 2026
9b3c138
RDKEMW-22177: update automation to use new PAT
Jul 22, 2026
daa7cb7
Merge pull request #110 from rdkcentral/feature/RDKEMW-22177
brendanobra Jul 22, 2026
b89f244
Merge branch 'main' into auto-sync/develop-to-main
brendanobra Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
token: ${{ secrets.AUTOMATION_TOKEN }}

- name: Setup Node.js
uses: actions/setup-node@v4
Expand All @@ -30,4 +30,4 @@ jobs:
- name: Run semantic-release
run: npm --prefix .github/release exec -- semantic-release --extends ./.github/release/releaserc.json
env:
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.AUTOMATION_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/sync-develop-to-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Checkout full history
uses: actions/checkout@v4
with:
token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
token: ${{ secrets.AUTOMATION_TOKEN }}
fetch-depth: 0

- name: Configure git identity
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Open PR on conflict
if: steps.check.outputs.already_synced == 'false' && (steps.merge.outputs.conflict == 'true' || steps.push_merged.outputs.push_failed == 'true')
env:
GH_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
GH_TOKEN: ${{ secrets.AUTOMATION_TOKEN }}
run: |
PR_BRANCH="auto-sync/${{ env.SOURCE_BRANCH }}-to-${{ env.TARGET_BRANCH }}"
REASON="merge conflict"
Expand Down
Loading