From 16742f0925664fecbb0224888b556b292da32f57 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Wed, 22 Mar 2023 22:06:18 -0400 Subject: [PATCH 1/2] leave a comment on PR for merge conflicts --- .github/workflows/automations.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automations.yml b/.github/workflows/automations.yml index d7a2f3df..161c1ec5 100644 --- a/.github/workflows/automations.yml +++ b/.github/workflows/automations.yml @@ -30,4 +30,5 @@ jobs: uses: eps1lon/actions-label-merge-conflict@releases/2.x with: dirtyLabel: "merge conflict" + commentOnDirty: "This pull request has merge conflicts. Please resolve the conflicts so the PR can be reviewed. Thanks!" repoToken: ${{ secrets.GITHUB_TOKEN }} From a8947028023f8c1e4bcac8c4909aea5ab48b392c Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Wed, 29 Mar 2023 00:20:53 -0400 Subject: [PATCH 2/2] Use jellyfin bot whenever possible --- .github/workflows/auto-close-stale-pr.yml | 2 +- .github/workflows/automations.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-close-stale-pr.yml b/.github/workflows/auto-close-stale-pr.yml index b04d4ea8..3074e4c0 100644 --- a/.github/workflows/auto-close-stale-pr.yml +++ b/.github/workflows/auto-close-stale-pr.yml @@ -18,4 +18,4 @@ jobs: days-before-pr-stale: 21 days-before-pr-close: 7 exempt-draft-pr: true - repo-token: ${{ secrets.GITHUB_TOKEN }} + repo-token: ${{ secrets.JF_BOT_TOKEN }} diff --git a/.github/workflows/automations.yml b/.github/workflows/automations.yml index 161c1ec5..2086d6d7 100644 --- a/.github/workflows/automations.yml +++ b/.github/workflows/automations.yml @@ -31,4 +31,4 @@ jobs: with: dirtyLabel: "merge conflict" commentOnDirty: "This pull request has merge conflicts. Please resolve the conflicts so the PR can be reviewed. Thanks!" - repoToken: ${{ secrets.GITHUB_TOKEN }} + repoToken: ${{ secrets.JF_BOT_TOKEN }}