Skip to content

Commit 6150b53

Browse files
committed
fix(ci): drop the perf job's unreachable merge_group fallbacks
The perf job only runs on `pull_request`, and #2062, which adds the `merge_group` trigger, keeps the perf comment PR-only, so the `merge_group.base_sha` and `github.sha` fallbacks and the comment promising merge_group support could never apply. Remove them. Reported by Cubic on #2061.
1 parent c463cc1 commit 6150b53

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,10 @@ jobs:
466466
timeout-minutes: 30
467467
# The PR side is the checked-out merge commit (`github.sha`), built on top
468468
# of the base commit, so a branch behind its base is not credited with the
469-
# base's newer commits. merge_group events provide the same pair.
469+
# base's newer commits.
470470
env:
471-
BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
472-
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
471+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
472+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
473473

474474
steps:
475475
- name: Checkout merge commit

0 commit comments

Comments
 (0)