From 7c3e6e555aa67503f1c5595734f3ee54a1246c01 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 26 Oct 2021 20:22:31 +0200 Subject: [PATCH 1/5] first try --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 834e097..bdee079 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,13 +156,19 @@ marqovtest_Buster_clang: stage: test <<: *src_except_definition script: - - apt-get update && apt-get install -y libhdf5-dev libeigen3-dev + - echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list + - apt-get update && apt-get install -y libhdf5-dev libeigen3-dev cmake - cmake -E make_directory build - cd build - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER=clang++ .. - cmake --build . --target all --config Release - - ctest -O log.txt + - ctest --version + - ctest -O log.txt --output-junit marqov-junit.xml - cat log.txt | grep "tests passed" | cut -d " " -f 1 + artifacts: + when: always + reports: + junit: ./build/marqov-junit.xml marqovtest_Buster_pgi: image: git.physik.uni-wuerzburg.de:25812/z03/pdi/debian:bullseye-pgi-21-03 -- GitLab From 615433a4bdd8a8a355e12cdad3d22e4301db7955 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 26 Oct 2021 20:42:45 +0200 Subject: [PATCH 2/5] get proper cmake from backports --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdee079..d697f26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,7 +157,8 @@ marqovtest_Buster_clang: <<: *src_except_definition script: - echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list - - apt-get update && apt-get install -y libhdf5-dev libeigen3-dev cmake + - apt-get update && apt-get install -y libhdf5-dev libeigen3-dev + - apt-get install -t bullseye-backports cmake - cmake -E make_directory build - cd build - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER=clang++ .. -- GitLab From 0071f4f3c50f38b50cfddfe2831d6b184ec8cd80 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 26 Oct 2021 22:05:04 +0200 Subject: [PATCH 3/5] use proper image. And now also have tests on bullseye --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d697f26..b36f9d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,7 +152,7 @@ MARQOVtest_Buster: <<: *test_definition marqovtest_Buster_clang: - image: git.physik.uni-wuerzburg.de:25812/z03/pdi/debian:buster-clang + image: git.physik.uni-wuerzburg.de:25812/z03/pdi/debian:bullseye-clang stage: test <<: *src_except_definition script: -- GitLab From 90a77fa02d8b2cd265b49031f38d204b56ab4bc8 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 26 Oct 2021 22:06:21 +0200 Subject: [PATCH 4/5] Proper name of test. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b36f9d8..1f7d190 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,7 +151,7 @@ MARQOVtest_Buster: image: git.physik.uni-wuerzburg.de:25812/z03/pdi/debian:buster-gxx <<: *test_definition -marqovtest_Buster_clang: +marqovtest_Bullseye_clang: image: git.physik.uni-wuerzburg.de:25812/z03/pdi/debian:bullseye-clang stage: test <<: *src_except_definition -- GitLab From 12cc9b2b43e7d43a0fe6cb16c2fcf08f766307fb Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 26 Oct 2021 22:25:24 +0200 Subject: [PATCH 5/5] forgot yes-to-all --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f7d190..64d8ba4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,7 +158,7 @@ marqovtest_Bullseye_clang: script: - echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list - apt-get update && apt-get install -y libhdf5-dev libeigen3-dev - - apt-get install -t bullseye-backports cmake + - apt-get install -y -t bullseye-backports cmake - cmake -E make_directory build - cd build - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER=clang++ .. -- GitLab