Skip to content

Commit

Permalink
[BOT] - Auto-merge refs/heads/master into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
reyaan-boltman authored Sep 14, 2023
2 parents e7f9d14 + 98eab98 commit 069234c
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 0 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/hotfix-to-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "Hotfix to Develop Automation"
on:
push:
branches:
- "hotfix/*"

jobs:
merge-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: everlytic/[email protected]
with:
github_token: ${{ secrets.ADMIN_REYAAN_MERGE_TOKEN }}
source_ref: ${{ github.ref }}
target_branch: 'develop'
commit_message_template: '[BOT] - Auto-merge {source_ref} into {target_branch}'
17 changes: 17 additions & 0 deletions .github/workflows/hotfix-to-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "Hotfix to Release Automation"
on:
push:
branches:
- "hotfix/*"

jobs:
merge-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: everlytic/branch-merge-v2@master
with:
github_token: ${{ secrets.ADMIN_REYAAN_MERGE_TOKEN }}
source_ref: ${{ github.ref }}
target_branch: "release/*"
commit_message_template: '[BOT] - Auto-merge {source_ref} into {target_branch}'
17 changes: 17 additions & 0 deletions .github/workflows/master-to-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "Master to Develop Automation"
on:
push:
branches:
- "master"

jobs:
merge-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: everlytic/[email protected]
with:
github_token: ${{ secrets.ADMIN_REYAAN_MERGE_TOKEN }}
source_ref: ${{ github.ref }}
target_branch: 'develop'
commit_message_template: '[BOT] - Auto-merge {source_ref} into {target_branch}'

0 comments on commit 069234c

Please sign in to comment.