From 46caa4122c4eacafba8e38f4b9344dd149064a10 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Wed, 21 May 2025 14:43:50 -0700 Subject: [PATCH] ci: add workflow to label merge conflicts (#1269) Add a workflow to label merge conflicts, making it more obvious when PRs have a merge conflicts. This is also used by Home Manager and Nixpkgs. Link: https://github.com/nix-community/stylix/pull/1269 Co-authored-by: pancho horrillo Reviewed-by: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Reviewed-by: Matt Sturgeon Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- .github/workflows/conflicts.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/conflicts.yml diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml new file mode 100644 index 00000000..6e549a0d --- /dev/null +++ b/.github/workflows/conflicts.yml @@ -0,0 +1,27 @@ +--- +name: Label Merge Conflicts + +on: # yamllint disable-line rule:truthy + push: + branches: + - master + - release-** + +jobs: + conflicts: + runs-on: ubuntu-24.04 + if: github.repository_owner == 'nix-community' + steps: + - uses: actions/create-github-app-token@v2 + id: app-token + with: + app-id: ${{ vars.APP_ID }} + private-key: ${{ secrets.APP_PRIVATE_KEY }} + permission-contents: read + permission-pull-requests: write + - uses: mschilde/auto-label-merge-conflicts@v2 + with: + GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} + CONFLICT_LABEL_NAME: "status: merge conflict" + MAX_RETRIES: 5 + WAIT_MS: 10000