Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add option to specify semantic version category #532

Merged
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
21b004a
feat: add MERGE_CATEGORY option to action.yml
dunyakirkali Sep 10, 2020
f2e84e3
feat: add option to specify ANY as MERGE_CATEGORY and make it the def…
dunyakirkali Sep 10, 2020
23eb473
chore: update readme
dunyakirkali Sep 10, 2020
f7b3354
feat: expand inputParser to allow parsing of MERGE_CATEGORY
dunyakirkali Sep 10, 2020
ed13d74
chore: correct inputParser tests
dunyakirkali Sep 10, 2020
fc7361c
chore: lint
dunyakirkali Sep 10, 2020
798afce
chore: run formatter
dunyakirkali Sep 10, 2020
8a3580b
chore: remove ANY from mergeCategories
dunyakirkali Sep 12, 2020
294872b
chore: format README
dunyakirkali Sep 14, 2020
6d53914
feat: add basic pr title parser
dunyakirkali Sep 14, 2020
dea81e4
chore: format
dunyakirkali Sep 14, 2020
55b95e8
feat: check MERGE_CATEGORY for pullRequest handler
dunyakirkali Sep 14, 2020
908699f
chore: format
dunyakirkali Sep 14, 2020
951021b
chore: format
dunyakirkali Sep 14, 2020
8ad2426
chore: format
dunyakirkali Sep 14, 2020
4eea2c1
chore: check return type explicitly
dunyakirkali Sep 14, 2020
0a088c0
chore: correct test name
dunyakirkali Sep 14, 2020
f2b6a59
chore: boyscout
dunyakirkali Sep 14, 2020
95d21c7
chore: fix import sorting
dunyakirkali Sep 14, 2020
b7ded69
chore: handle optionals
dunyakirkali Sep 14, 2020
35c6fa7
chore: boyscout
dunyakirkali Sep 14, 2020
0d79bd3
chore: boyscout
dunyakirkali Sep 14, 2020
8de9d2e
chore: boyscout
dunyakirkali Sep 14, 2020
f0af6ae
chore: boyscout
dunyakirkali Sep 14, 2020
ac86293
chore: boyscout
dunyakirkali Sep 14, 2020
2da8f82
chore: specify radix for parseInt
dunyakirkali Sep 14, 2020
e70e6f7
chore: handle optionals
dunyakirkali Sep 14, 2020
ec7d72a
chore: use types
dunyakirkali Sep 14, 2020
c8a27ce
chore: format
dunyakirkali Sep 14, 2020
e65eab9
Revert "chore: format"
dunyakirkali Sep 14, 2020
5b59287
Revert "chore: use types"
dunyakirkali Sep 14, 2020
d4259cd
chore: fix typo
dunyakirkali Sep 14, 2020
3895beb
chore: rename file and function name
dunyakirkali Sep 14, 2020
b3537b2
chore: correct import name
dunyakirkali Sep 14, 2020
fc95e6f
chore: format
dunyakirkali Sep 14, 2020
5aaab66
chore: add missing test case
Sep 14, 2020
cc02ad5
chore: add missing test cases
Sep 14, 2020
7b26315
chore: update README
dunyakirkali Sep 15, 2020
877cdac
chore: boyscout
dunyakirkali Sep 15, 2020
61e8743
chore: use english words instead of names
dunyakirkali Sep 15, 2020
3ba6fb6
Merge branch 'master' into feat/add_option_to_specify_semantic_versio…
merlinnot Sep 15, 2020
50b29ba
chore: use third person passive voice in README
dunyakirkali Sep 15, 2020
a8a94bc
chore: rename MERGE_CATEGORY to PRESET
dunyakirkali Sep 15, 2020
913647a
chore: add missing test
dunyakirkali Sep 15, 2020
d1631a7
chore: split up test suites
Sep 15, 2020
a508051
Merge branch 'master' into feat/add_option_to_specify_semantic_versio…
dunyakirkali Sep 15, 2020
24bb9be
chore: remove test title
Sep 15, 2020
25e51a7
chore: update README.md
dunyakirkali Sep 16, 2020
8b1e7cc
Merge branch 'master' into feat/add_option_to_specify_semantic_versio…
dunyakirkali Sep 16, 2020
d12466b
chore: prepend semantic version components with DEPENDABOT_
dunyakirkali Sep 16, 2020
6c3bfe8
chore: rename AllowedMergeCategories to AllowedMergePresets for consi…
dunyakirkali Sep 16, 2020
ac85b6f
chore: rename spec file more logically
dunyakirkali Sep 16, 2020
304c1b0
feat: remove default PRESET
dunyakirkali Sep 16, 2020
2390ad9
chore: lint
dunyakirkali Sep 16, 2020
9f22ac8
chore: remove unused import
dunyakirkali Sep 16, 2020
120ae1c
feat: make PRESET optional
dunyakirkali Sep 16, 2020
ae20ebc
Merge branch 'master' into feat/add_option_to_specify_semantic_versio…
dunyakirkali Sep 16, 2020
33877af
chore: update PRESET description
dunyakirkali Sep 16, 2020
390e80d
chore: remove accidentally comited config file for asdf
dunyakirkali Sep 16, 2020
dbffbb9
chore: ad new line
dunyakirkali Sep 16, 2020
ebdba90
chore: update README
dunyakirkali Sep 16, 2020
c360b4f
feat: remove DEPENDABOT_MAJOR
dunyakirkali Sep 16, 2020
65a917c
chore: change its to it is
dunyakirkali Sep 17, 2020
e770c52
chore: correct outdated setting
dunyakirkali Sep 17, 2020
efb5ef6
chore: boyscout
dunyakirkali Sep 17, 2020
6d44d08
chore: fix PRESET description in action.yml
dunyakirkali Sep 17, 2020
2ecfddf
chore: update action.yml
dunyakirkali Sep 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions README.md
Expand Up @@ -142,6 +142,24 @@ steps:
MERGE_METHOD: MERGE
```

### Specify the semantic versioning category to use
dunyakirkali marked this conversation as resolved.
Show resolved Hide resolved

By default, this GitHub Action assumes merge category is `DEPENDABOT_MAJOR`.
dunyakirkali marked this conversation as resolved.
Show resolved Hide resolved
This feature looks at the title of the PR to figure out what is being updated. A
dependabot style title such as:
`chore(deps): bump @types/jest from 26.0.12 to 27.0.13` is expected. You can
override the merge category by changing the value of `PRESET` parameter (one of
`DEPENDABOT_MAJOR`, `DEPENDABOT_MINOR` or `DEPENDABOT_PATCH`):

```yaml
steps:
- name: Merge me!
uses: ridedott/merge-me-action@master
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PRESET: DEPENDABOT_PATCH
```

### Number of retries

In case the merge action fails, by default it will automatically be retried up
Expand Down
6 changes: 6 additions & 0 deletions action.yml
Expand Up @@ -18,6 +18,12 @@ inputs:
One of: MERGE, STASH or REBASE'
required: false
default: SQUASH
PRESET:
description:
'Specify the semantic version category to automatically merge. One of:
dunyakirkali marked this conversation as resolved.
Show resolved Hide resolved
DEPENDABOT_MAJOR, DEPENDABOT_MINOR or DEPENDABOT_PATCH'
required: false
default: DEPENDABOT_MAJOR
runs:
using: 'node12'
main: 'dist/index.js'