From cf2c563302782b370a9ae1619e714772f83a00c8 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 12 Aug 2025 17:02:05 -0400 Subject: [PATCH] fix(ci): use sha instead of ref in changes.yml --- .github/workflows/changes.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml index e1c31195919e4..111ab22e97c9b 100644 --- a/.github/workflows/changes.yml +++ b/.github/workflows/changes.yml @@ -126,8 +126,8 @@ on: e2e-opentelemetry-logs: value: ${{ jobs.e2e_tests.outputs.opentelemetry-logs }} env: - BASE_REF: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_ref) || github.event.pull_request.base.ref }} - HEAD_REF: ${{ inputs.head_ref || (github.event_name == 'merge_group' && github.event.merge_group.head_ref) || github.event.pull_request.head.ref }} + BASE_SHA: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_sha) || github.event.pull_request.base.sha }} + HEAD_SHA: ${{ inputs.head_ref || (github.event_name == 'merge_group' && github.event.merge_group.head_sha) || github.event.pull_request.head.sha }} jobs: # Detects changes that are not specific to integration tests @@ -151,8 +151,8 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: filter with: - base: ${{ env.BASE_REF }} - ref: ${{ env.HEAD_REF }} + base: ${{ env.BASE_SHA }} + ref: ${{ env.HEAD_SHA }} filters: | source: - ".github/workflows/test.yml" @@ -257,8 +257,8 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: filter with: - base: ${{ env.BASE_REF }} - ref: ${{ env.HEAD_REF }} + base: ${{ env.BASE_SHA }} + ref: ${{ env.HEAD_SHA }} filters: int_test_filters.yaml # This JSON hack was introduced because GitHub Actions does not support dynamic expressions in the @@ -335,6 +335,6 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: filter with: - base: ${{ env.BASE_REF }} - ref: ${{ env.HEAD_REF }} + base: ${{ env.BASE_SHA }} + ref: ${{ env.HEAD_SHA }} filters: int_test_filters.yaml