From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Mon, 29 Apr 2024 04:23:49 +0000 (+0200) Subject: Update PR Labeler to v5 (#26845) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=aab103865e006abe9c4117436d705ad697553eba;p=space-station-14.git Update PR Labeler to v5 (#26845) * Update PR Labeler to v5 * Change conflict labeler. * Implement draft filtering functionality * Actually, pull_request_target is appropriate here. --- diff --git a/.github/labeler.yml b/.github/labeler.yml index b088f22943..886ce89708 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,12 +1,18 @@ "Changes: Sprites": -- '**/*.rsi/*.png' +- changed-files: + - any-glob-to-any-file: '**/*.rsi/*.png' "Changes: Map": -- 'Resources/Maps/*.yml' -- 'Resources/Prototypes/Maps/*.yml' +- changed-files: + - any-glob-to-any-file: + - 'Resources/Maps/*.yml' + - 'Resources/Prototypes/Maps/*.yml' "Changes: UI": -- '**/*.xaml*' +- changed-files: + - any-glob-to-any-file: '**/*.xaml*' "No C#": -- all: ["!**/*.cs"] +- changed-files: + # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label. + - all-globs-to-all-files: "!**/*.cs" diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index a78716bde6..1e2125c30a 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -1,18 +1,20 @@ name: Check Merge Conflicts on: - push: - branches: - - master pull_request_target: + types: + - opened + - synchronize + - reopened + - ready_for_review jobs: Label: - if: github.actor != 'PJBot' + if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) runs-on: ubuntu-latest steps: - name: Check for Merge Conflicts - uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 + uses: eps1lon/actions-label-merge-conflict@v3.0.0 with: dirtyLabel: "Merge Conflict" repoToken: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml index 711eb0ccac..42ed100981 100644 --- a/.github/workflows/labeler-pr.yml +++ b/.github/workflows/labeler-pr.yml @@ -6,8 +6,9 @@ on: jobs: labeler: if: github.actor != 'PJBot' + permissions: + contents: read + pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@v3 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" + - uses: actions/labeler@v5