Merge pull request #1123 from mrapp-ke/update-dependencies #85
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- | |
| name: Merge bugfix into feature branch | |
| on: | |
| push: | |
| branches: | |
| - bugfix | |
| jobs: | |
| merge_bugfix: | |
| name: Merge bugfix into feature branch | |
| runs-on: ubuntu-latest | |
| if: "!contains(github.event.head_commit.message, '[Bot]')" | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@v4 | |
| with: | |
| ref: feature | |
| - name: Reset bugfix branch | |
| run: | | |
| export FEATURE_VERSION="$(cat .version)" | |
| git fetch origin bugfix:bugfix | |
| git reset --hard bugfix | |
| echo -n "${FEATURE_VERSION}" > .version | |
| - name: Generate token | |
| uses: actions/create-github-app-token@v1 | |
| id: app-token | |
| with: | |
| app-id: ${{ secrets.TOKEN_APP_ID }} | |
| private-key: ${{ secrets.TOKEN_APP_SECRET }} | |
| - name: Submit pull request | |
| id: pull-request | |
| uses: peter-evans/create-pull-request@v6 | |
| with: | |
| token: ${{ steps.app-token.outputs.token }} | |
| commit-message: '[Bot] Merge bugfix into feature branch.' | |
| branch: merge-bugfix | |
| title: Merge bugfix into feature branch | |
| labels: bot | |
| body: Merge branch "bugfix" into "feature". | |
| - name: Enable auto-merge | |
| env: | |
| GH_TOKEN: ${{ steps.app-token.outputs.token }} | |
| run: gh pr merge --merge --auto "${{ steps.pull-request.outputs.pull-request-number }}" |