label merge-conflict action

This action adds a given label to Pull Requests that have merge conflicts and removes a given label from these pull requests

Example usage

name: "Maintenance"
on:
  # So that PRs touching the same files as the push are updated
  push:
  # So that the `dirtyLabel` is removed if conflicts are resolve
  # We recommend `pull_request_target` so that github secrets are available.
  # In `pull_request` we wouldn't be able to change labels of fork PRs
  pull_request_target:
    types: [synchronize]

jobs:
  main:
    runs-on: ubuntu-latest
    steps:
      - name: check if prs are dirty
        uses: eps1lon/actions-label-merge-conflict@v3
        with:
          dirtyLabel: "PR: needs rebase"
          removeOnDirtyLabel: "PR: ready to ship"
          repoToken: "${{ secrets.GITHUB_TOKEN }}"
          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

You can use eps1lon/actions-label-merge-conflict@main instead to get the latest, experimental version.

Why?

PRs are usually open for a few days until a maintainer can take a look. When this happens a Pull Request (PR) might already be outdated without the author being notified of this. A maintainer either has to resolve them (which takes time) or has to ping the author. This creates a feedback loop that can be reduced by this action.

This actions achieve this with minimal noise (no comment bloat) by adding a label to a PR if it has merge conflicts. This means the author has a single overview of which PRs need a rebase by using their list of created PRs. At the same time the maintainer has a simple filter for PRs that have merge conflicts.

Motivation

isaacs/github#224: Notify when merge conflict arises

Inputs

`dirtyLabel`

Required The name of the label that should be added once a PR has merge conflicts. This label is removed once a PR becomes mergable again.

`repoToken`

Required Token for the repository. Can be passed in using {{ secrets.GITHUB_TOKEN }}

`removeOnDirtyLabel`

The name of the label that should be removed once a PR has merge conflicts.

Default: No label is removed if a PR is marked as dirty.

`retryAfter`

Number of seconds after which the mergable state is checked again if it is unknown (GitHub is still calculating it).

Default: 120

`retryMax`

Number of times the script will check the mergable state aigain. After that it will print a warning.

Default: 5

`continueOnMissingPermissions`

Boolean. Whether to continue or fail when the provided token is missing permissions. By default pull requests from a fork do not have access to secrets and get a read only github token, resulting in a failure to update tags.

Default: false

`commentOnDirty`

String. Comment to add when the pull request is conflicting. Supports markdown.

Default: No comment is posted.

`commentOnClean`

String. Comment to add when the pull request is not conflicting anymore. Supports markdown.

Default: No comment is posted.

actions-label-merge-conflict

Commits

release: 3.0.3 (#137)

actions.yml: fix typo (#136)

chore(deps): update dependency typescript to v5.5.3 (#130)

chore(deps): update dependency @types/node to v20.14.11 (#128)

chore(deps): update dependency @types/node to v20.14.4 (#127)

release: 3.0.2

README