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

Improve CI sentinel job for better branch protection (backport #2743) #2746

Merged
merged 2 commits into from
Sep 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2022

This is an automatic backport of pull request #2743 done by Mergify.
Cherry-pick of cc507a8 has failed:

On branch mergify/bp/3.5.x/pr-2743
Your branch is up to date with 'origin/3.5.x'.

You are currently cherry-picking commit cc507a84.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/test.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Previously, failed jobs in the CI matrix would cause the sentinel job
(all-tests-passed) to be skipped, which for purposes of Github Actions
branch protection would count as "success". This allowed PRs with
failing CI to be merged. This new approach which uses two sentinel jobs
should not suffer from this same issue.

(cherry picked from commit cc507a8)

# Conflicts:
#	.github/workflows/test.yml
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Sep 20, 2022
@mergify mergify bot merged commit c11eead into 3.5.x Sep 20, 2022
@mergify mergify bot deleted the mergify/bp/3.5.x/pr-2743 branch September 20, 2022 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant