From 22cbd71c8439d27eddedc97fd34a3add90bca121 Mon Sep 17 00:00:00 2001
From: Dmitrii Anoshin <anoshindx@gmail.com>
Date: Tue, 7 Jan 2025 14:07:49 -0800
Subject: [PATCH] Fix freeze check job (#12050)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

<!-- Issue number if applicable -->
#### Link to tracking issue
Fixes #

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->
---
 .github/workflows/check-merge-freeze.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/check-merge-freeze.yml b/.github/workflows/check-merge-freeze.yml
index 3fa5f1bdb61..75fea380f66 100644
--- a/.github/workflows/check-merge-freeze.yml
+++ b/.github/workflows/check-merge-freeze.yml
@@ -19,19 +19,12 @@ on:
 permissions: read-all
 
 jobs:
-  debug-merge-freeze:
-    name: Debug
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - run: "echo github.event.pull_request.title: ${{ github.event.pull_request.title }}, github.event.pull_request.user.name: ${{ github.event.pull_request.user.name }}"
-
   check-merge-freeze:
     name: Check
     # 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