Skip to content

Releases: motlin/forbid-merge-commits-action

v1.0.8

Choose a tag to compare

@motlin motlin released this 22 Jun 02:16

What's Changed

  • Fix local test by adding mock PR event payload and yamllint config by @motlin in #38
  • Sync foundational files from project-template by @motlin in #40
  • Bump actions/checkout from v4 to v6 to drop Node 20 dependency. by @motlin in #41
  • Simplify the .gitattributes file by removing the CRLF and linguist rules. by @motlin in #42

Full Changelog: v1.0.7...v1.0.8

v1.0.7

Choose a tag to compare

@motlin motlin released this 26 Jan 13:37
d508a7b

What's Changed

  • Add justfile for local development commands. by @motlin in #36
  • Support Gitea by using github.event.pull_request.head.sha by @tfaller in #37

New Contributors

Full Changelog: v1.0.6...v1.0.7

v1.0.6

Choose a tag to compare

@motlin motlin released this 26 Aug 16:33

What's Changed

  • Improve documentation about PR rebasing and merge queue compatibility. by @motlin in #34
  • Add configurable fail notice by @Poeschl in #35

New Contributors

Full Changelog: v1.0.5...v1.0.6

v1.0.5

Choose a tag to compare

@motlin motlin released this 18 Mar 16:05
9f1c649

What's Changed

  • Add configuration fail-on-merge-commits to allow the action to either warn or fail. by @motlin in #32

Full Changelog: v1.0.4...v1.0.5

v1.0.4

Choose a tag to compare

@motlin motlin released this 29 Sep 18:09
8a2b180

What's Changed

  • Improve error message by including the event type when the action fails. by @motlin in #31
  • Improve README.md

Full Changelog: v1.0.3...v1.0.4

v1.0.3

Choose a tag to compare

@motlin motlin released this 12 Jul 14:56
4b6ef05

What's Changed

  • Upgrade actions/checkout from v3 to v4. by @motlin in #27
  • Rename workflow job from check-merge-commits to forbid-merge-commits. by @motlin in #28

Full Changelog: v1.0.2...v1.0.3

v1.0.2

Choose a tag to compare

@motlin motlin released this 10 Jul 12:55
90cdd44

What's Changed

  • Fix broken link to Atlassian blog. by @motlin in #22
  • Apply Apache 2.0 License. by @motlin in #23
  • Add a warning if the action is used on triggers other than pull_request. by @motlin in #24 and #26

Full Changelog: v1.0.1...v1.0.2

v1.0.1

Choose a tag to compare

@motlin motlin released this 23 Jun 00:02
bc5eeac

What's Changed

  • Downgrade actions/checkout from v4 to v3. by @motlin in #21

Full Changelog: v1.0.0...v1.0.1

v1.0.0

Choose a tag to compare

@motlin motlin released this 22 Jun 16:31

This Action fails on Pull Requests that include merge commits.

This rule is designed to prevent developers from merging the default branch into their branch as a way of making it up-to-date. This creates foxtrot commits and confusing git log graphs.

This rule is also designed to prevent using GitHub's "Update Branch" button, which merges the base branch into the source branch. Instead, use the pull-down "Rebase Branch" button which rebases the source branch onto the base branch. This is a common problem if "Always suggest updating pull request branches" is enabled, because "Update Branch" is the default choice in the pull-down and it cannot be disabled or changed.

Full Changelog: https://github.com/motlin/forbid-merge-commits-action/commits/v1.0.0