diff --git a/.github/workflows/validate-pnpm-config.yml b/.github/workflows/validate-pnpm-config.yml index 2a472e3..49da9ab 100644 --- a/.github/workflows/validate-pnpm-config.yml +++ b/.github/workflows/validate-pnpm-config.yml @@ -63,9 +63,10 @@ jobs: set -euo pipefail ref="${WORKFLOW_REF##*@}" - # Caller workflows on pull_request can resolve to refs/pull//merge, which - # does not exist in the workflows repository. Fall back to the configured branch. - if [[ -z "${ref}" || "${ref}" == refs/pull/* ]]; then + # Caller workflows on pull_request resolve to refs/pull//merge and on + # merge_group to refs/heads/gh-readonly-queue/*, neither of which exists in + # the workflows repository. Fall back to the configured branch. + if [[ -z "${ref}" || "${ref}" == refs/pull/* || "${ref}" == refs/heads/gh-readonly-queue/* ]]; then ref="${WORKFLOWS_FALLBACK_REF}" elif [[ "${ref}" == refs/heads/* ]]; then ref="${ref#refs/heads/}"