Skip to content

chore: merge main back to rc automatically after release #175 #176

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

Merged
airikej merged 2 commits into from
Oct 31, 2025
Merged

chore: merge main back to rc automatically after release #175 #176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b933ad
chore: merge main back to rc automatically after release #175
airikej Oct 31, 2025
0ea4375
chore: fix job name #175
airikej Oct 31, 2025
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
23 changes: 23 additions & 0 deletions .github/workflows/angular-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,26 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPMJS_TEDI_AUTH_TOKEN }}

merge-to-rc:
needs: build-and-deploy
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main
- name: Configure Git
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Merge main into rc
run: |
git fetch origin rc
git checkout rc
git merge origin/main --no-edit || true
git push origin rc