From 5e845e6db3b2ec3c3c28152d5e8fdcdb1a2fe763 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 15 Jun 2022 17:13:20 -0400 Subject: [PATCH] CI: fix junit upload cmake ver requirement --- .gitlab-ci.yml | 8 ++++---- .gitlab/ci/ctest_test.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83c218ef0..2b20d74a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,9 +206,9 @@ stages: - build/*.png - build/*.pnm - build/*.pmm + - build/unit_test_junit_stats.xml reports: - junit: - - build/junit.xml + junit: build/unit_test_junit_stats.xml .cmake_build_artifacts: &cmake_build_artifacts artifacts: @@ -240,9 +240,9 @@ stages: - build/**/*.png - build/**/*.pnm - build/**/*.pmm + - build/unit_test_junit_stats.xml reports: - junit: - - build/junit.xml + junit: build/unit_test_junit_stats.xml include: diff --git a/.gitlab/ci/ctest_test.cmake b/.gitlab/ci/ctest_test.cmake index 647e278c1..f889c1032 100644 --- a/.gitlab/ci/ctest_test.cmake +++ b/.gitlab/ci/ctest_test.cmake @@ -32,8 +32,8 @@ if (test_exclusions) set(test_exclusions "(${test_exclusions})") endif () -if (CMAKE_VERSION VERSION_GREATER 3.21.0) - set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/junit.xml") +if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21) + set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/unit_test_junit_stats.xml") endif() set(PARALLEL_LEVEL "10")