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

Fixes concurrency group to speed up merge queues #10680

Merged
merged 1 commit into from
Dec 3, 2023

Conversation

koppor
Copy link
Member

@koppor koppor commented Dec 2, 2023

This PR enables parallel builds in the merge queue. Now, merges are build in parallel, but with the previous entries in the merge queue inside. In case a predecessor fails, it is exluded and the all subsquent builds are run again. See https://github.com/orgs/community/discussions/63136#discussioncomment-7738973 for a graphics.

I tried out the "fix" at https://github.com/winery/test-concurrency-at-merge-queues - and it looked good! 😅

More background: After thinking more of https://github.com/orgs/community/discussions/63136 and why GitHub did not answer it, I thought, it must be a user error.

Mandatory checks

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@koppor
Copy link
Member Author

koppor commented Dec 2, 2023

If it works, we need to report at https://github.com/orgs/community/discussions/63136

Copy link
Contributor

github-actions bot commented Dec 2, 2023

The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build.

@koppor koppor marked this pull request as draft December 3, 2023 11:23
@koppor
Copy link
Member Author

koppor commented Dec 3, 2023

Queue while building:

grafik

Queued PR:

grafik

@koppor
Copy link
Member Author

koppor commented Dec 3, 2023

Queue waits for others being added:

grafik

grafik


For each build, another branch is created

grafik

github.ref

The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by push, this is the branch or tag ref that was pushed. For workflows triggered by pull_request, this is the pull request merge branch. For workflows triggered by release, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is refs/heads/<branch_name>, for pull requests it is refs/pull/<pr_number>/merge, and for tags it is refs/tags/<tag_name>. For example, refs/heads/feature-branch-1.

Source: https://docs.github.com/en/actions/learn-github-actions/contexts

github.head_ref:

The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target.

Source: https://docs.github.com/en/actions/learn-github-actions/contexts

@koppor
Copy link
Member Author

koppor commented Dec 3, 2023

I tested it again. Works (in the little scenario)

Will merge in and adapt merge queue settings.

Let's see, what happens :p

@koppor koppor marked this pull request as ready for review December 3, 2023 11:36
@koppor koppor enabled auto-merge December 3, 2023 11:36
@koppor koppor added this pull request to the merge queue Dec 3, 2023
Merged via the queue into main with commit 846929d Dec 3, 2023
19 of 20 checks passed
@koppor koppor deleted the fix-merge-queue-concurrency branch December 3, 2023 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants