summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2023-11-02 01:01:01 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2023-11-02 19:24:45 (GMT)
commit06661b1e4ce2a60e114ca2e67c42d50d20e0092a (patch)
tree12056d3090611e7e74c33d050aed131a354fa428
parenta518e402c5dc1f2677e6cb1ef529b8d886b585d5 (diff)
downloadCMake-06661b1e4ce2a60e114ca2e67c42d50d20e0092a.zip
CMake-06661b1e4ce2a60e114ca2e67c42d50d20e0092a.tar.gz
CMake-06661b1e4ce2a60e114ca2e67c42d50d20e0092a.tar.bz2
gitlab-ci: pull annotations for CDash from the jobs
Only move `cdash-build-id` between stages that make sense.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab/artifacts.yml26
2 files changed, 28 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c1c9cc..032a6fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,6 +105,7 @@ l:iwyu-debian12:
- .debian12_iwyu
- .cmake_build_linux
- .linux_x86_64_tags
+ - .cmake_cdash_artifacts
- .run_automatically
l:tidy-fedora38:
@@ -112,6 +113,7 @@ l:tidy-fedora38:
- .fedora38_tidy
- .cmake_build_linux
- .linux_x86_64_tags
+ - .cmake_cdash_artifacts
- .run_automatically
l:sphinx-fedora38:
diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml
index d9943b8..f4d413b 100644
--- a/.gitlab/artifacts.yml
+++ b/.gitlab/artifacts.yml
@@ -62,6 +62,10 @@
- ${CMAKE_CI_BUILD_DIR}/Testing/
- ${CMAKE_CI_BUILD_DIR}/DartConfiguation.tcl
- ${CMAKE_CI_BUILD_DIR}/CTestCustom.cmake
+ - ${CMAKE_CI_BUILD_DIR}/cdash-build-id
+ reports:
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
.cmake_release_artifacts:
artifacts:
@@ -82,12 +86,26 @@
- ${CMAKE_CI_BUILD_DIR}/cmake-*.zip
# Any unsigned packages made.
- ${CMAKE_CI_BUILD_DIR}/unsigned/cmake-*
+ - ${CMAKE_CI_BUILD_DIR}/cdash-build-id
+ reports:
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
+
+.cmake_cdash_artifacts:
+ artifacts:
+ expire_in: 1d
+ when: always
+ reports:
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
.cmake_junit_artifacts:
artifacts:
expire_in: 1d
when: always
reports:
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
junit:
- ${CMAKE_CI_BUILD_DIR}/junit.xml
@@ -95,6 +113,9 @@
artifacts:
expire_in: 1d
when: always
+ reports:
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
paths:
# Take the sphinx logs.
- ${CMAKE_CI_BUILD_DIR}/build-*.log
@@ -108,6 +129,8 @@
reports:
junit:
- ${CMAKE_CI_BUILD_DIR}/junit.xml
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
paths:
# Take the install tree.
- ${CMAKE_CI_BUILD_DIR}/install/
@@ -115,6 +138,9 @@
.cmake_doc_artifacts:
artifacts:
expire_in: 1d
+ reports:
+ annotations:
+ - ${CMAKE_CI_BUILD_DIR}/annotations.json
paths:
# Take the install tree.
- ${CMAKE_CI_BUILD_DIR}/install-doc/