From 79f623dd61531fd595e4b852393d264f51bdfbc5 Mon Sep 17 00:00:00 2001 From: Gerd Zellweger Date: Thu, 9 Jul 2026 10:15:28 -0700 Subject: [PATCH] ci: fix pre-merge queue job not re-formatting PRs Signed-off-by: Gerd Zellweger --- .github/workflows/ci-pre-mergequeue.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-pre-mergequeue.yml b/.github/workflows/ci-pre-mergequeue.yml index ea882d18376..604cd516f00 100644 --- a/.github/workflows/ci-pre-mergequeue.yml +++ b/.github/workflows/ci-pre-mergequeue.yml @@ -30,16 +30,11 @@ jobs: # Compute the internal-PR boolean once so individual steps can reference # it; cheaper to grep and less fragile when triggers expand. + # Must stay a ${{ }} expression: run steps on the k8s runners execute + # under plain `sh`, where bash-only tests like [[ ]] fail silently. - name: Determine if this is an internal PR id: pr-check - run: | - if [[ "${{ github.event_name }}" == "pull_request" \ - && "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" \ - && "${{ github.actor }}" != "dependabot[bot]" ]]; then - echo "internal=true" >> "$GITHUB_OUTPUT" - else - echo "internal=false" >> "$GITHUB_OUTPUT" - fi + run: echo "internal=${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}" >> "$GITHUB_OUTPUT" - name: Disable sccache for fork/dependabot PRs (secrets unavailable) if: ${{ steps.pr-check.outputs.internal != 'true' }}