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

[19490] Fix Github windows CI (backport #3887) #3910

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2023

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

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

You are currently cherry-picking commit 7057142d6.
  (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:
	new file:   .github/workflows/config/default_ci_2.10.x.repos
	new file:   .github/workflows/config/default_ci_2.11.x.repos
	new file:   .github/workflows/config/default_ci_2.6.x.repos
	renamed:    .github/workflows/config/default_ci.repos -> .github/workflows/config/default_ci_master.repos
	new file:   .github/workflows/config/nightly_2.10.x.repos
	new file:   .github/workflows/config/nightly_2.11.x.repos
	new file:   .github/workflows/config/nightly_2.6.x.repos
	renamed:    .github/workflows/config/nightly.repos -> .github/workflows/config/nightly_master.repos
	modified:   .github/workflows/nightly-windows-ci.yml
	modified:   .github/workflows/windows-ci.yml

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

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

* Refs #19490: Fix nightly windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Look for OpenSSL directory in several places

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Fix Fast DDS branch selection

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Defer to master if cannot find repos

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Apply Miguel's suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 7057142)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 6, 2023
@mergify mergify bot mentioned this pull request Oct 6, 2023
6 tasks
@JLBuenoLopez JLBuenoLopez added this to the v2.11.3 milestone Oct 24, 2023
@JLBuenoLopez
Copy link
Contributor

@EduPonz, can you review and fix the conflicts?

@MiguelCompany
Copy link
Member

Closed in favor of #3967

@MiguelCompany MiguelCompany deleted the mergify/bp/2.11.x/pr-3887 branch October 27, 2023 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants