Skip to content

Commit

Permalink
Commit action code to new repository
Browse files Browse the repository at this point in the history
  • Loading branch information
jasondantuma committed Jul 7, 2020
1 parent df8fe2f commit 73ba2a9
Show file tree
Hide file tree
Showing 7 changed files with 9,862 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.idea
node_modules
.DS_Store
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Merge Branch
Automate merging of a source branch into a target branch.

## Usage

```yaml
on:
push:
branches:
- "release/*"
jobs:
merge-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: everlytic/merge-branch
with:
github_token: ${{ github.token }}
source_ref: ${{ github.ref }}
target_branch: 'master'
```
20 changes: 20 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Merge Branch'
description: 'Merges a source branch into a target branch'
inputs:
github_token:
description: 'Token to authenticate with GitHub'
required: true
default: ${{ secrets.GITHUB_TOKEN }}
source_ref:
description: 'Branch or SHA1 ref that you are merging into the target_branch.'
required: true
default: ${{ github.ref }}
target_branch:
description: 'Branch you are merging into'
required: true
runs:
using: 'node12'
main: 'dist/index.js'
branding:
icon: git-merge
color: green
Loading

0 comments on commit 73ba2a9

Please sign in to comment.