Skip to content

Propagate changes from main into development #484

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
github-actions wants to merge 5 commits into from
Closed

Propagate changes from main into development #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23e4d9f
Add base branch patterns for feature and nightly
Wikid82 Jan 12, 2026
2b259ff
Update base branch patterns in renovate.json
Wikid82 Jan 12, 2026
cb877af
Fix base branch pattern for Renovate configuration
Wikid82 Jan 12, 2026
22a23da
Add nightly branch to propagate changes workflow
Wikid82 Jan 12, 2026
c7b8dca
Merge branch 'development' into main
Wikid82 Jan 12, 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
3 changes: 2 additions & 1 deletion .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"helpers:pinGitHubActionDigests"
],
"baseBranchPatterns": [
"development"
"feature/beta-release",
"nightly"
],
"timezone": "UTC",
"dependencyDashboard": true,
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/propagate-changes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- main
- development
- nightly

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -145,9 +146,11 @@ jobs:

if (currentBranch === 'main') {
// Main -> Development
await createPR('main', 'development');
await createPR('main', 'development', 'nightly');
} else if (currentBranch === 'development') {
// Development -> Feature branches
// Development -> Nightly
} else if (currentBranch === 'nightly') {
// Nightly -> Feature branches
const branches = await github.paginate(github.rest.repos.listBranches, {
owner: context.repo.owner,
repo: context.repo.repo,
Expand Down
Loading