Skip to content

[20318] Fix and refactor Windows Github CI (backport #4356)#4363

Merged
EduPonz merged 2 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4356
Feb 16, 2024
Merged

[20318] Fix and refactor Windows Github CI (backport #4356)#4363
EduPonz merged 2 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4356

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 8, 2024

This is an automatic backport of pull request #4356 done by Mergify.
Cherry-pick of 7adc833 has failed:

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

You are currently cherry-picking commit 7adc833b4.
  (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/sanitizer-tests.yaml
	modified:   test/unittest/logging/log_macros/LogMacrosDefaultTests.cpp
	modified:   thirdparty/boost/test/ThirdpartyBoostCompile_test.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/config/default_ci.meta
	both modified:   .github/workflows/config/nightly.meta
	both modified:   .github/workflows/reusable-windows-ci.yml
	deleted by us:   cmake/testing/GoogleTest.cmake

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 Feb 8, 2024
@mergify mergify Bot mentioned this pull request Feb 8, 2024
7 tasks
@EduPonz EduPonz added this to the v2.6.8 milestone Feb 14, 2024
@EduPonz EduPonz force-pushed the mergify/bp/2.6.x/pr-4356 branch from 97528e9 to 374a003 Compare February 14, 2024 14:48
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Feb 14, 2024
* Fix and refactor Windows Github CI (#4356)

* Refs #20318: Fix passing of RUNTIME_LIST to test discovery

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

* Refs #20318: Refactor windows workflow

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

* Refs #20318: Compile warnings as errors

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

Refs #20318: Only use warnings as errors for Fast DDS

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

Refs #20318: Do not override existing CXX_FLAGS

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

* Refs #20318: Use thirdparty for Asio and TinyXML2

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

* Refs #20318: Add cancel-in-progress to sanitizer jobs

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

* Refs #20318: Apply Ricardo's suggestions

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

* Refs #20318. Avoid build error on default_macros_test

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20318: Adjust working dir for test report

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

* Refs #20318: Uncrustify

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

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 7adc833)

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

* Fix conflicts

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

* Test report action does not run when no-test label is set (#4366)

* Refs #20400: Test report action does not run when no-test label is set

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

* Refs #20400: Add GTest cmake options to nightly.meta

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

* Refs #20400: Use test step conclusion to decide whether to run test report step

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

* Refs #20400: Apply Miguel's suggestion

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

---------

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

* Refs #20318. Add GTEST_INDIVIDUAL=ON

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

* Refs #20318: Add test summary step

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

* Use tagged version for test_reporter action

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20318: Enforce unique name for test artifacts

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

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz EduPonz force-pushed the mergify/bp/2.6.x/pr-4356 branch from e5426e6 to 7b4b7d8 Compare February 15, 2024 19:36
@EduPonz EduPonz merged commit 2c3f843 into 2.6.x Feb 16, 2024
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4356 branch February 16, 2024 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running first-to-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant