Skip to content

Commit

Permalink
ci: auto merge main into the feature branch
Browse files Browse the repository at this point in the history
Signed-off-by: Yurii Shynbuiev <[email protected]>
  • Loading branch information
yshyn-iohk committed Jun 17, 2024
1 parent 8bc2018 commit a492b66
Showing 1 changed file with 61 additions and 0 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Auto Merge Main into Feature Branch

# Automatically merge main into a feature branch when a pull request is labeled with 'autoupdate'

on:
pull_request:
types: [opened, synchronize, reopened, labeled]

jobs:
auto-merge:
if: contains(github.event.pull_request.labels.*.name, 'autoupdate')
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
ref: main

- name: Set up GPG key to extract the Git configuration
uses: crazy-max/ghaction-import-gpg@v3
id: import_gpg
with:
gpg-private-key: ${{ secrets.HYP_BOT_GPG_PRIVATE }}
passphrase: ${{ secrets.HYP_BOT_GPG_PASSWORD }}
git-user-signingkey: true
git-commit-gpgsign: true
git_config_global: true
git_tag_gpgsign: true

- name: Set up Git
run: |
git config --global user.name '${{ steps.import_gpg.outputs.name }}'
git config --global user.email '${{ steps.import_gpg.outputs.email }}'
- name: Fetch all branches
run: git fetch --all

- name: Checkout the feature branch
run: git checkout ${{ github.event.pull_request.head.ref }}

- name: Merge main into feature branch
run: git merge origin/main

- name: Push changes
run: git push origin ${{ github.event.pull_request.head.ref }}
if: success()

- name: Add comment to PR
if: success()
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const prNumber = ${{ github.event.pull_request.number }};
github.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: prNumber,
body: 'The main branch has been successfully merged into this feature branch.'
});

0 comments on commit a492b66

Please sign in to comment.