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.

Sign up for GitHub

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

Jump to bottom

[18149] Fix build on msvc 19.36.32528 (backport #3462) #3467

Merged
merged 1 commit into from
Apr 21, 2023
Merged

[18149] Fix build on msvc 19.36.32528 (backport #3462) #3467

merged 1 commit into from
Apr 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 17, 2023

This is an automatic backport of pull request #3462 done by Mergify.

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

@MiguelCompany @mergify
Fix build on msvc 19.36.32528 (#3462)
9632109 
* Refs #18147. Fix build on new MSVC versions

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Document reason for alias.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Fix linter.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 14de049)
@mergify mergify bot mentioned this pull request Apr 17, 2023
Merged
9 tasks
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label ci-pending PR which CI is running labels Apr 17, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@JesusPoderoso
Copy link
Contributor

@richiprosima Please test linux

@JesusPoderoso
Copy link
Contributor

@richiprosima Please test discovery-server

@JesusPoderoso
Copy link
Contributor

@MiguelCompany can you take a look at the CI conflicts?

@JesusPoderoso JesusPoderoso added conflicts Backport PR wich git cherry pick failed and removed ci-pending PR which CI is running labels Apr 19, 2023
@MiguelCompany
Copy link
Member

@MiguelCompany can you take a look at the CI conflicts?

They are not conflicts. We still have to update the CI infrastructure so that jobs for 2.1.x are run in Ubuntu Focal instead of Jammy.

This PR only affects Windows, which has passed correctly, so I think we can safely merge this backport

@JesusPoderoso
Copy link
Contributor

@MiguelCompany can you take a look at the CI conflicts?

They are not conflicts. We still have to update the CI infrastructure so that jobs for 2.1.x are run in Ubuntu Focal instead of Jammy.

This PR only affects Windows, which has passed correctly, so I think we can safely merge this backport

I see, then feel free to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed conflicts Backport PR wich git cherry pick failed labels Apr 21, 2023
@MiguelCompany MiguelCompany merged commit 02281c4 into 2.1.x Apr 21, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-3462 branch April 21, 2023 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @JesusPoderoso