diff --git a/.github/workflows/angular-release.yml b/.github/workflows/angular-release.yml index 9303b465e..c76cf7552 100644 --- a/.github/workflows/angular-release.yml +++ b/.github/workflows/angular-release.yml @@ -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