From 258f65d2f4f7d98d0d65f6cbb0566f36070eeef1 Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 08:10:08 +0200 Subject: [PATCH 1/7] add some more functionality --- .gitlab-ci.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 040d86b..8a5ed3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ stages: - linting + - build + - test pre-commit: stage: linting @@ -12,3 +14,21 @@ pre-commit: - pre-commit run --all-files --verbose --color always only: - merge_requests + + +build: + stage: build + image: bscpm/citools + script: + - mkdir build && cd build + - cmake .. + - make + +ctest: + stage: test + image: bscpm/citools + script: + - mkdir build && cd build + - cmake .. + - make + - ctest -- GitLab From 56e86e9237cb892daec2ef6a8ce0dc7a70449008 Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 08:14:33 +0200 Subject: [PATCH 2/7] Added different image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a5ed3b..c4333c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ pre-commit: build: stage: build - image: bscpm/citools + image: ci-debian12-x86_64-2024-03-04 script: - mkdir build && cd build - cmake .. @@ -26,7 +26,7 @@ build: ctest: stage: test - image: bscpm/citools + image: ci-debian12-x86_64-2024-03-04 script: - mkdir build && cd build - cmake .. -- GitLab From 4220b61649add0500c89c691ee06daccde1d9179 Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 08:15:01 +0200 Subject: [PATCH 3/7] Added different image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4333c5..ea61e6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ pre-commit: build: stage: build - image: ci-debian12-x86_64-2024-03-04 + image: kitware/cmake:ci-debian12-x86_64-2024-03-04 script: - mkdir build && cd build - cmake .. @@ -26,7 +26,7 @@ build: ctest: stage: test - image: ci-debian12-x86_64-2024-03-04 + image: kitware/cmake:ci-debian12-x86_64-2024-03-04 script: - mkdir build && cd build - cmake .. -- GitLab From 5d03f7dee1059cd136ae256af54e5c90f853b70a Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 09:07:49 +0200 Subject: [PATCH 4/7] Added different image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea61e6d..04a3ecf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ pre-commit: build: stage: build - image: kitware/cmake:ci-debian12-x86_64-2024-03-04 + image: ubuntu:latest script: - mkdir build && cd build - cmake .. @@ -26,7 +26,7 @@ build: ctest: stage: test - image: kitware/cmake:ci-debian12-x86_64-2024-03-04 + image: ubuntu:latest script: - mkdir build && cd build - cmake .. -- GitLab From e200699562d9a647467e2f089e08b670893e3c9c Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 09:10:31 +0200 Subject: [PATCH 5/7] Added different image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04a3ecf..2772ee3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ pre-commit: build: stage: build - image: ubuntu:latest + image: danger89/cmake:5.1 script: - mkdir build && cd build - cmake .. @@ -26,7 +26,7 @@ build: ctest: stage: test - image: ubuntu:latest + image: danger89/cmake:5.1 script: - mkdir build && cd build - cmake .. -- GitLab From 7cb1d10e722510fe3d0ee5f6492d82fafaf1e75c Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 09:29:25 +0200 Subject: [PATCH 6/7] Ugly --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2772ee3..c5d00cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,10 @@ pre-commit: build: stage: build - image: danger89/cmake:5.1 + image: ubuntu:latest + before_script: + - apt-get update && apt-get install -y clang gcc g++ gfortran git make cmake + pkg-config && rm -rf /var/lib/apt/lists/* script: - mkdir build && cd build - cmake .. @@ -26,7 +29,10 @@ build: ctest: stage: test - image: danger89/cmake:5.1 + image: ubuntu:latest + before_script: + - apt-get update && apt-get install -y clang gcc g++ gfortran git make cmake + pkg-config && rm -rf /var/lib/apt/lists/* script: - mkdir build && cd build - cmake .. -- GitLab From 0ac50f9d8c642182aea7956db65b2a80284500d9 Mon Sep 17 00:00:00 2001 From: Valentin Seitz Date: Tue, 9 Jul 2024 09:54:51 +0200 Subject: [PATCH 7/7] small fix for include guard --- src/utils/parallelism_helper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/parallelism_helper.cpp b/src/utils/parallelism_helper.cpp index 772d640..61734ea 100644 --- a/src/utils/parallelism_helper.cpp +++ b/src/utils/parallelism_helper.cpp @@ -1,9 +1,9 @@ -#include #include #include #ifdef WITH_MPI +#include bool MPIHelper::IsUsingMPI() const { return is_using_mpi_; } -- GitLab