From 541139dffcc285ab8a0eb9a38a493e2aa95237d9 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Fri, 16 Sep 2022 12:45:47 -0700 Subject: [PATCH] Merge queue: prepare triage internal changes (#30730) --- .../workflows/triage-unallowed-internal-changes.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/triage-unallowed-internal-changes.yml b/.github/workflows/triage-unallowed-internal-changes.yml index b1ba9895da..a44b3d4520 100644 --- a/.github/workflows/triage-unallowed-internal-changes.yml +++ b/.github/workflows/triage-unallowed-internal-changes.yml @@ -25,17 +25,24 @@ concurrency: jobs: check-internal-changes: - if: github.repository == 'github/docs-internal' && github.event.pull_request.user.login != 'Octomerger' + if: github.repository == 'github/docs-internal' && github.event.pull_request && github.event.pull_request.user.login != 'Octomerger' runs-on: ubuntu-latest outputs: notAllowedSearchSyncLabel: ${{ steps.filter.outputs.notAllowedSearchSyncLabel }} steps: + # This checkout is needed for merge_group + - name: Checkout + uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 + with: + ref: ${{ github.head_ref }} + token: ${{ secrets.DOCUBOT_REPO_PAT }} + - name: Get files changed uses: dorny/paths-filter@eb75a1edc117d3756a18ef89958ee59f9500ba58 id: filter with: # Base branch used to get changed files - base: ${{ github.event.pull_request.base.ref || github.base_ref || github.ref }} + base: ${{ github.event.pull_request.base.ref || github.base_ref || github.ref || 'main' }} # Enables setting an output in the format in `${FILTER_NAME}_files # with the names of the matching files formatted as JSON array @@ -45,6 +52,7 @@ jobs: filters: | notAllowedSearchSyncLabel: - 'lib/search/indexes/**' + notAllowedSearchSyncLabel: needs: check-internal-changes if: ${{ needs.check-internal-changes.outputs.notAllowedSearchSyncLabel == 'true' }}