Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include both pull_request and merge_group triggers #3104

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

kathyavini
Copy link
Collaborator

@kathyavini kathyavini commented Jan 31, 2024

Description

Alongside the recently merged Cypress PR #3100 we have set up a merge queue on integration. To my great sadness using the merge queue (merge_group workflow trigger) did not in fact trigger the GitHub workflow upon the most recent merge.

This StackOverflow and the linked GitHub discussion suggest that -- as of July 2023 but the discussion has not been amended otherwise in the intervening months -- merge_group on its own is insufficient; the pull_request trigger must also be added and then filtered out.

I have copied the example.

UPDATE: But I dislike that a notification is still sent/check is still listed for the filtered out job...!

Jira link: NONE

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

  • Passes test case
  • UI components visually reviewed on desktop view
  • UI components visually reviewed on mobile view
  • Other (please explain)

As it is a GitHub workflow trigger it's really hard to test without merging.

Checklist:

  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • The precommit and linting ran successfully
  • I have added or updated language tags for text that's part of the UI
  • I have added "MISSING" for all new language tags to languages I don't speak
  • I have added the GNU General Public License to all new files

@kathyavini kathyavini self-assigned this Jan 31, 2024
@kathyavini kathyavini requested review from a team as code owners January 31, 2024 22:16
@kathyavini kathyavini requested review from antsgar and SayakaOno and removed request for a team January 31, 2024 22:16
Copy link
Collaborator

@antsgar antsgar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, makes me sad too! But seems in line with the docs, I hadn't noticed that https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#triggering-merge-group-checks-with-github-actions

From what it says there I think we'll also need to add this workflow as a required check on the integration branch so that it'll mark the queue as failed if that job doesn't pass.

@SayakaOno SayakaOno added this pull request to the merge queue Jan 31, 2024
Merged via the queue into integration with commit 833aeb1 Jan 31, 2024
5 checks passed
@SayakaOno SayakaOno deleted the revise-merge-queue-workflow-trigger branch January 31, 2024 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants