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

[20486] Avoid running GitHub CI if PR has conflicts (backport #4489) #4490

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 1, 2024

This is an automatic backport of pull request #4489 done by Mergify.
Cherry-pick of 3ed793c has failed:

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

You are currently cherry-picking commit 3ed793cc3.
  (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)

Changes to be committed:
	modified:   .github/workflows/mac-ci.yml
	modified:   .github/workflows/sanitizer-tests.yaml
	modified:   .github/workflows/thread-sanitizer.yaml
	modified:   .github/workflows/windows-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/documentation-tests.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 1, 2024
Copy link
Contributor Author

mergify bot commented Mar 1, 2024

Cherry-pick of 3ed793c has failed:

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

You are currently cherry-picking commit 3ed793cc3.
  (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)

Changes to be committed:
	modified:   .github/workflows/mac-ci.yml
	modified:   .github/workflows/sanitizer-tests.yaml
	modified:   .github/workflows/thread-sanitizer.yaml
	modified:   .github/workflows/windows-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/documentation-tests.yaml

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

@JesusPoderoso JesusPoderoso added this to the v2.13.4 milestone Mar 1, 2024
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)
@JesusPoderoso JesusPoderoso added skip-ci Automatically pass CI and removed conflicts Backport PR wich git cherry pick failed labels Mar 1, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Mar 1, 2024
@EduPonz EduPonz merged commit a9a5666 into 2.13.x Mar 1, 2024
11 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4489 branch March 1, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants