Go to file
Rishabh Jain 6ec8363d74
Update readme.md (#38)
- Update method to fetch github_token from secrets
- Add example to merge branch with commit message
2023-03-17 01:13:58 +01:00
fixtures refactor gem 2019-11-24 04:27:36 +01:00
lib Added the ability to not merge fastforwards so that Github does not make empty (#28) 2022-10-20 02:34:01 +02:00
screenshots upgrade screenshot 2019-11-26 18:26:36 +01:00
spec fix validate inputs 2020-03-15 22:41:21 +01:00
.dockerignore use Gemfile 2019-11-26 19:06:53 +01:00
.gitignore test issue comment 2019-11-03 23:43:14 +01:00
CHANGELOG.md update chagelog 2021-08-29 19:30:45 +02:00
Dockerfile use Gemfile 2019-11-26 19:06:53 +01:00
Gemfile use Gemfile 2019-11-26 19:06:53 +01:00
Gemfile.lock Bump addressable from 2.7.0 to 2.8.0 (#14) 2021-08-29 19:26:48 +02:00
README.md Update readme.md (#38) 2023-03-17 01:13:58 +01:00
action.yml Added the ability to not merge fastforwards so that Github does not make empty (#28) 2022-10-20 02:34:01 +02:00

README.md

Merge branch action

Runs a git merge in your CI.

Examples:

Sync branches

name: Sync multiple branches
on:
  push:
    branches:
      - '*'
jobs:
  sync-branch:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master

      - name: Merge development -> staging
        uses: devmasx/merge-branch@master
        with:
          type: now
          from_branch: development
          target_branch: staging
          github_token: ${{ secrets.GITHUB_TOKEN }}

      - name: Merge staging -> uat
        uses: devmasx/merge-branch@master
        with:
          type: now
          from_branch: staging
          target_branch: uat
          github_token: ${{ secrets.GITHUB_TOKEN }}

Merge current branch

name: Merge any release branch to uat
on:
  push:
    branches:
      - 'release/*'
jobs:
  merge-branch:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master

      - name: Merge staging -> uat
        uses: devmasx/merge-branch@master
        with:
          type: now
          target_branch: uat
          github_token: ${{ secrets.GITHUB_TOKEN }}

Merge current branch with commit message

name: Merge any release branch to uat
on:
  push:
    branches:
      - 'release/*'
jobs:
  merge-branch:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master

      - name: Merge staging -> uat
        uses: devmasx/merge-branch@master
        with:
          type: now
          target_branch: uat
          message: Merge staging into uat
          github_token: ${{ secrets.GITHUB_TOKEN }}

On labeled

Merge pull request branch using GitHub labels.

When you set a label in a pull request this action can merge the pull request branch to other branch, useful for develop branch or staging environments.

PR Checker

name: Merge branch with labeled
on:
  pull_request:
    types: [labeled]
jobs:
  merge-branch:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master

      - name: Merge by labeled
        uses: devmasx/merge-branch@master
        with:
          label_name: 'merged in develop'
          target_branch: 'develop'
          github_token: ${{ secrets.GITHUB_TOKEN }}