From 5c57fd59e59bf1e325bdc40b82b2671dac7a592a Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 7 Jan 2025 14:10:09 -0800 Subject: [PATCH] [chore] Fix check merge freeze job again In https://github.com/open-telemetry/opentelemetry-collector/pull/12045, I assumed that `github.event.pull_request.user.name` would be present, but apparently it's not. So we need to switch back to using `github.event.pull_request.user.login` --- .github/workflows/check-merge-freeze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-freeze.yml b/.github/workflows/check-merge-freeze.yml index 87f4ea8fda6..75fea380f66 100644 --- a/.github/workflows/check-merge-freeze.yml +++ b/.github/workflows/check-merge-freeze.yml @@ -24,7 +24,7 @@ jobs: # This condition is to avoid blocking the PR causing the freeze in the first place. if: | (!startsWith(github.event.pull_request.title || github.event.merge_group.head_commit.message, '[chore] Prepare release')) || - (github.event.pull_request.user.name || github.event.merge_group.head_commit.author.name) != 'OpenTelemetry Bot' + (!(github.event.pull_request.user.login == 'opentelemetrybot' || github.event.merge_group.head_commit.author.name == 'OpenTelemetry Bot')) runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2