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

[21092] Run selected VS tool on Windows CI #4854

Merged
merged 1 commit into from
May 29, 2024
Merged

Conversation

JesusPoderoso
Copy link
Contributor

@JesusPoderoso JesusPoderoso commented May 27, 2024

Description

In previous Windows CI refactors, the usage of the selected VS tool (Win v141 / VS 2017 and Win v142 / VS2019) was missed.
This PR restores the tool selection for proper configuration and build per selected platform.

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • N/A Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso added this to the v2.14.2 milestone May 27, 2024
@JesusPoderoso JesusPoderoso self-assigned this May 27, 2024
@github-actions github-actions bot added ci-pending PR which CI is running labels May 27, 2024
@JesusPoderoso JesusPoderoso added needs-review PR that is ready to be reviewed and removed ci-pending PR which CI is running labels May 28, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label May 28, 2024
@EduPonz EduPonz removed the needs-review PR that is ready to be reviewed label May 28, 2024
@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 28, 2024
@EduPonz
Copy link

EduPonz commented May 29, 2024

@Mergifyio backport 2.13.x 2.10.x 2.6.x

@EduPonz EduPonz merged commit 8305478 into 2.14.x May 29, 2024
4 of 12 checks passed
@EduPonz EduPonz deleted the hotfix/windows_ci_v141 branch May 29, 2024 05:22
Copy link
Contributor

mergify bot commented May 29, 2024

backport 2.13.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request May 29, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 8305478)
mergify bot pushed a commit that referenced this pull request May 29, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 8305478)
mergify bot pushed a commit that referenced this pull request May 29, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 8305478)
MiguelCompany pushed a commit that referenced this pull request May 29, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 8305478)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request May 31, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 8305478)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Jun 5, 2024
* Run selected VS tool on Windows CI (#4854)

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 8305478)

* Fix windows v141 compilation issues

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants