Skip to content

Commit

Permalink
Fix and refactor Windows Github CI (#4356) (#4360)
Browse files Browse the repository at this point in the history
* Fix and refactor Windows Github CI (#4356)

* 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>

* Refs #20318: Set Fast CDR version for CI to 2.1.x branch

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

* Refs #20318: Use GTEST_INDIVIDUAL=ON

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: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
  • Loading branch information
3 people authored Feb 16, 2024
1 parent 5290e99 commit 169d476
Show file tree
Hide file tree
Showing 10 changed files with 125 additions and 643 deletions.
59 changes: 34 additions & 25 deletions .github/workflows/config/default_ci.meta
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
{
"names":
{
"fastrtps" :
{
"cmake-args": [
"-DEPROSIMA_BUILD=ON",
"-DINTERNAL_DEBUG=ON",
"-DGTEST_INDIVIDUAL=ON",
"-DFASTRTPS_API_TESTS=OFF",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DNO_TLS=OFF",
"-DSECURITY=ON",
"-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes
--num-callers=50 --log-fd=2 --error-exitcode=1",
"-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
]
},
"googletest-distribution" :
{
"cmake-args" : ["-Dgtest_force_shared_crt=ON"]
}
}
}
names:
fastrtps:
cmake-args:
- "-DBUILD_DOCUMENTATION=OFF"
- "-DBUILD_SHARED_LIBS=ON"
- "-DCOMPILE_EXAMPLES=ON"
- "-DEPROSIMA_BUILD_TESTS=ON"
- "-DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS=/MP /WX"
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DFASTRTPS_API_TESTS=OFF"
- "-DGTEST_INDIVIDUAL=ON"
- "-DINSTALL_EXAMPLES=ON"
- "-DINSTALL_TOOLS=ON"
- "-DINTERNAL_DEBUG=ON"
- "-DNO_TLS=OFF"
- "-DPERFORMANCE_TESTS=ON"
- "-DPROFILING_TESTS=OFF"
- "-DSECURITY=ON"
- "-DSHM_TRANSPORT_DEFAULT=ON"
- "-DSTRICT_REALTIME=OFF"
- "-DSYSTEM_TESTS=ON"
- "-DTHIRDPARTY_Asio=FORCE"
- "-DTHIRDPARTY_fastcdr=OFF"
- "-DTHIRDPARTY_TinyXML2=FORCE"
- "-DTHIRDPARTY_UPDATE=ON"
- "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
googletest-distribution:
cmake-args:
- "-Dgtest_force_shared_crt=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DBUILD_GMOCK=ON"
2 changes: 1 addition & 1 deletion .github/workflows/config/default_ci_2.12.x.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: v2.1.0
version: 2.1.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
Expand Down
57 changes: 33 additions & 24 deletions .github/workflows/config/nightly.meta
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
{
"names":
{
"fastrtps" :
{
"cmake-args": [
"-DEPROSIMA_BUILD=ON",
"-DINTERNAL_DEBUG=ON",
"-DGTEST_INDIVIDUAL=ON",
"-DFASTRTPS_API_TESTS=OFF",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DNO_TLS=OFF",
"-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes
--num-callers=50 --log-fd=2 --error-exitcode=1",
"-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
]
},
"googletest-distribution" :
{
"cmake-args" : ["-Dgtest_force_shared_crt=ON"]
}
}
}
names:
fastrtps:
cmake-args:
- "-DBUILD_DOCUMENTATION=OFF"
- "-DBUILD_SHARED_LIBS=ON"
- "-DCOMPILE_EXAMPLES=ON"
- "-DEPROSIMA_BUILD_TESTS=ON"
- "-DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS=/MP /WX"
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DFASTRTPS_API_TESTS=OFF"
- "-DGTEST_INDIVIDUAL=ON"
- "-DINSTALL_EXAMPLES=ON"
- "-DINSTALL_TOOLS=ON"
- "-DINTERNAL_DEBUG=ON"
- "-DNO_TLS=OFF"
- "-DPERFORMANCE_TESTS=ON"
- "-DPROFILING_TESTS=OFF"
- "-DSHM_TRANSPORT_DEFAULT=ON"
- "-DSTRICT_REALTIME=OFF"
- "-DSYSTEM_TESTS=ON"
- "-DTHIRDPARTY_Asio=FORCE"
- "-DTHIRDPARTY_fastcdr=OFF"
- "-DTHIRDPARTY_TinyXML2=FORCE"
- "-DTHIRDPARTY_UPDATE=ON"
- "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
googletest-distribution:
cmake-args:
- "-Dgtest_force_shared_crt=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DBUILD_GMOCK=ON"
2 changes: 1 addition & 1 deletion .github/workflows/config/nightly_2.12.x.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: v2.1.0
version: 2.1.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
label: 'nightly-sec-windows-ci'
cmake-args: "-DSECURITY=ON"
ctest-args: "-LE xfail"
fastdds_branch: 'master'
fastdds_branch: '2.12.x'

nightly-nosec-windows-ci:
uses: ./.github/workflows/reusable-windows-ci.yml
with:
label: 'nightly-nosec-windows-ci'
cmake-args: "-DSECURITY=OFF"
ctest-args: "-LE xfail"
fastdds_branch: 'master'
fastdds_branch: '2.12.x'
Loading

0 comments on commit 169d476

Please sign in to comment.