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

ci: only satisfy pre-checks once merge requested #8275

Merged
merged 2 commits into from
Aug 29, 2023

Conversation

mhofman
Copy link
Member

@mhofman mhofman commented Aug 29, 2023

Description

#8253 left in place the cancellation of any concurrent pull request integration test, because of #6466

Unfortunately that resulted in mergify offboarding a PR that had been labelled force:integration right when adding an automerge: label because:

  • all required checks had already succeeded (except for merge strategy chosen)
  • adding the automerge: label immediately satisfied the merge strategy chosen checks, and thus onboarded the PR onto the queue
    • the wait-integration-pre-checks check was already marked as success because of the force:integration label
    • the merge was pending on getting a integration-test-result check status
  • Actions triggered a new run of Integration tests

This PR tweaks the wait-integration-pre-checks check to only report a success once the PR is labelled with an automerge: label, instead of also allowing force:integration. This is not foolproof as cancellations may still happen if changing labels after adding the automerge: label, however that should be much less common an occurrence.

The right solution would be remove the GH managed concurrent check and restore the one based on source tree, aka solve #6466

Security Considerations

None

Scaling Considerations

None

Documentation Considerations

Add this known limitation to the wiki

Testing Considerations

Manually on this PR

Upgrade Considerations

None

@mhofman mhofman requested a review from michaelfig August 29, 2023 20:23
@mhofman mhofman added force:integration Force integration tests to run on PR automerge:squash Automatically squash merge labels Aug 29, 2023
@mergify mergify bot merged commit 89a3a85 into master Aug 29, 2023
@mergify mergify bot deleted the mhofman/merge-requested-check branch August 29, 2023 21:42
mhofman added a commit that referenced this pull request Jan 12, 2024
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
anilhelvaci pushed a commit to Jorge-Lopes/agoric-sdk that referenced this pull request Mar 4, 2024
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge:squash Automatically squash merge force:integration Force integration tests to run on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants