Feedback: Merges by pull request merge queue now attributed to Merge Queue bot #58673

willsmythe · 2023-06-21T17:33:40Z

willsmythe
Jun 21, 2023

Select Topic Area

Product Feedback

Body

We've shipped a fix to ensure merges by the pull request merge queue are always attributed to the GitHub Merge Queue bot (github-merge-queue[bot]). This change applies to new merges by the queue, and will appear in the activity view and in push webhook events.

This change was made because it's possible for multiple pull requests to be merged by the queue at the same time (i.e. in the same ref update). Before this change, these ref updates were being "randomly" (not technically, but this is how it appeared) attributed to one of the users that had enqueued one of the merged pull requests. This was definitely not the correct behavior. We made the decision to attribute all merge queue "merge" ref updates to the MQ bot because it would be correct for both scenarios (single PR and multi-PR merges by the queue).

See https://github.blog/changelog/2023-06-21-merges-by-pull-request-merge-queue-now-attributed-to-the-github-merge-queue-bot/

breml · 2023-06-22T05:16:34Z

breml
Jun 22, 2023

Hi @willsmythe
In our CI pipelines we use github.event.sender.login to send a message to a release slack channel. Now all the releases are triggered by the github-merge-queue[bot], which breaks our mapping for the notifications. Is the old value (the user login of the user triggering the merge of a PR) available in a different variable?

11 replies

jcw- Jun 24, 2023

This has broken our notification tooling as well - hoping for a revert...

breml Jun 26, 2023

We solved this issue by adding the following additional step to our pipeline:

      - uses: octokit/request-action@v2.x
        id: get_head_commit
        with:
          route: GET /repos/${{ github.repository }}/commits/${{ github.event.workflow_run.head_commit.id }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

The login of the github user who authored the last commit is then available through: ${{ fromJson(steps.get_head_commit.outputs.data).author.login }}.

abolla22 Sep 26, 2023

Im trying the same to get the github author . Tried with this Action but keep getting this error any idea whats causing it @breml ?
Error seeing:
GET /repos/${{ github.repository }} /commits/github_id_fix

mediaType: [object Object]
< 404

breml Sep 26, 2023

No, not from the details you provided.

mtamiola-priv Dec 29, 2023

have you try to provide commit sha instead of branch name @abolla22 ?

promiseofcake · 2023-06-23T15:58:20Z

promiseofcake
Jun 23, 2023

This is more of a breaking change than a fix in my opinion.

0 replies

phobologic · 2023-06-23T16:35:49Z

phobologic
Jun 23, 2023

+1 this is causing issues with systems that really need proper attribution. Would love a fix here, thanks.

0 replies

dylanklohr · 2023-06-27T21:41:03Z

dylanklohr
Jun 27, 2023

I'm looking to possibly introduce merge queues as part of an updated deploy strategy at my company. For those being impacted by this particular change, are commits that are being attributed to github-merge-queue[bot] only attributed to the bot, or are they showing as "co-authored"?

1 reply

ejholmes Jun 27, 2023

The actual git commit data (like if you were to git pull, or look at the commit in the GH UI) contains the correct author information. Just webhooks + GitHub API shows github-merge-queue[bot].

pww217 · 2023-09-28T15:17:12Z

pww217
Sep 28, 2023

This has been problematic for our CI too. We write helm values into a protected branch as part of the CI, and previously we had used a bot account that we owned and allowed it to bypass PR requirements to push these commits. I still want to require it for all devs and other actions, though.

But since turning on merge queues, the github.actor is github-merge-queue[bot] which is an implicit account that doesn't exist among my contributors to the repo, which means I can't add them to the PR check exception like I could for the old bot. I even tried to add the numerical account ID but no dice.

The weirdest part, though, is that sometimes the CI just works anyway. 3/4 times it fails ands says "lacking permissions to skip a PR", but sometimes it just works, and I can't figure out why so far.

There's extremely little info about this online, which is not surprising because Merge Queues are pretty new. Unfortunately for now we may just need to disable it for now because I don't see a good solution if I can't allow github-merge-queue[bot] to bypass PR checks or basically be treated like a normal Github account.

Would appreciate any advice, insights, or workarounds folks have of course!

0 replies

kudojp · 2023-12-13T07:18:45Z

kudojp
Dec 13, 2023

This caused a problem in the repository in my organization.

Issue explained

I enabled merge queue onto main branch.
I configured .circleci/config.yml as below so that the job deploy_onto_staging uses a context in it.

  - deploy_onto_staging:
    when:
      and:
        - equal: [<< pipeline.git.branch >>, main]
    context:
      - our_internal_context # This causes a problem.
    ...

In this way,

⭕ When I merge a PR to main branch manually, this job succeeded. This is because our_internal_context is configured to be accessible by All members in my organization.
❌ When a PR is merged with merge queue, this job failed. This is because github-merge-queue[bot] does not have an access to our_internal_context.

Possible solution

github-merge-queue[bot] should have the same access privilege to contexts as a user who enqueued the PR to the merge queue.

0 replies

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GitHub Community

Feedback: Merges by pull request merge queue now attributed to Merge Queue bot #58673

{{title}}

{{editor}}'s edit

{{editor}}'s edit

Replies: 6 comments 12 replies

{{title}}

{{editor}}'s edit

{{editor}}'s edit

{{title}}

{{title}}

{{title}}

{{editor}}'s edit

{{editor}}'s edit

{{title}}

{{title}}

{{editor}}'s edit

{{editor}}'s edit

{{title}}

{{title}}

{{title}}

{{title}}

{{title}}

{{title}}

Select a reply

Feedback: Merges by pull request merge queue now attributed to Merge Queue bot #58673

Select Topic Area

Body

Replies: 6 comments · 12 replies

Issue explained

Possible solution

Replies: 6 comments 12 replies