Releases: pascalgn/automerge-action
Release 0.7.4
Remove user-configured labels on successful merge (#50)
Release 0.7.3
Bug fix: Use pullRequest.base (instead of pullRequest.head) to get PR info, to correctly support merging PRs from forks
Release 0.7.2
Support literal commit message in MERGE_COMMIT_MESSAGE option
Release 0.7.1
Bug fix
Release 0.7.0
Add options MERGE_RETRY and MERGE_RETRIES_SLEEP
This release adds two new options, MERGE_RETRY (default 6) and MERGE_RETRIES_SLEEP (default 10000)
Action refactoring
This update includes some refactorings to make the configuration more consistent and allow more custom workflows.
This version includes breaking changes, so you need to adapt your workflow configuration!
From versions 0.4.3 and earlier
If your previous options looked like this
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
AUTOREBASE: "autorebase"
AUTOMERGE: "automerge"
then you need to decide which option you want to use in the future, "autorebase" or "automerge" (if you want to have both, see the comment in #26).
If you want to use the strategy previously named "autorebase", use the following configuration:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: "merge"
UPDATE_METHOD: "rebase"
(if you want to keep using the label name autorebase
, also add MERGE_LABELS: "autorebase"
and UPDATE_LABELS: "autorebase"
, otherwise the label name needs to be automerge
)
If you want to use the previous "automerge" strategy, you can use the default configuration:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
From version 0.5.0
If your previous options looked like this
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABEL: "automerge"
LABELS: "!wip"
UPDATE_LABEL: "automerge"
then you can use the following options in the new version:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: "automerge,!wip"
UPDATE_LABELS: "automerge"
Support new options MERGE_LABEL, UPDATE_LABEL
The two actions (merging the PR and updating the PR) will now each be triggered by different labels, configurable via MERGE_LABEL and UPDATE_LABEL
Commit message template bug fix
v0.4.3 Update README.md
New option COMMIT_MESSAGE_TEMPLATE
Add a new option COMMIT_MESSAGE_TEMPLATE
to specify the commit message to use when merging the pull request.