Skip to content

Releases: pascalgn/automerge-action

Release 0.7.4

08 Feb 11:06
a89c97f
Compare
Choose a tag to compare

Remove user-configured labels on successful merge (#50)

Release 0.7.3

27 Jan 06:30
629929d
Compare
Choose a tag to compare

Bug fix: Use pullRequest.base (instead of pullRequest.head) to get PR info, to correctly support merging PRs from forks

Release 0.7.2

15 Jan 20:47
c83bfe9
Compare
Choose a tag to compare

Support literal commit message in MERGE_COMMIT_MESSAGE option

Release 0.7.1

14 Jan 07:17
831713c
Compare
Choose a tag to compare

Release 0.7.0

11 Jan 15:29
02917e3
Compare
Choose a tag to compare
  • Add MERGE_DELETE_BRANCH configuration option #32
  • Stop retrying when code reviews are required #41
  • Check if PR has been merged during retries #43
  • Support new API event: schedule #37

Add options MERGE_RETRY and MERGE_RETRIES_SLEEP

20 Nov 17:12
06c9a0f
Compare
Choose a tag to compare

This release adds two new options, MERGE_RETRY (default 6) and MERGE_RETRIES_SLEEP (default 10000)

Action refactoring

09 Nov 18:08
a102df8
Compare
Choose a tag to compare

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

07 Nov 18:43
bb4bae2
Compare
Choose a tag to compare

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

26 Oct 13:34
6d8643b
Compare
Choose a tag to compare

New option COMMIT_MESSAGE_TEMPLATE

15 Oct 18:01
39c078f
Compare
Choose a tag to compare

Add a new option COMMIT_MESSAGE_TEMPLATE to specify the commit message to use when merging the pull request.