-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Commit action code to new repository
- Loading branch information
1 parent
df8fe2f
commit 73ba2a9
Showing
7 changed files
with
9,862 additions
and
0 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
.idea | ||
node_modules | ||
.DS_Store |
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
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' | ||
``` |
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
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 |
Oops, something went wrong.