From 5057e0efd9c23726518cc8dda5400562a94bd3de Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 28 May 2021 09:02:24 +0200
Subject: [PATCH] cmake install
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c983c3484..3e2d37b29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -264,12 +264,12 @@ build_test-clang-8:
- cmake --build . -- -j4
- set -o pipefail
- ctest -j4
- - make -j4 install
+ - cmake --build . -- -j4
- mkdir -p build_examples
- cd build_examples
- cmake -DCMAKE_BUILT_TYPE=Debug ../install/share/corsika/examples
- - make -j4
- - make -j4 run_examples | gzip -v -9 > examples.log.gz
+ - cmake --build . -- -j4
+ - cmake --build --target run_examples . -- -j4 | gzip -v -9 > examples.log.gz
rules:
- if: '$CI_MERGE_REQUEST_ID && ($CI_MERGE_REQUEST_TITLE =~ /^Draft:/ || $CI_MERGE_REQUEST_TITLE =~ /^WIP:/)'
when: manual
@@ -323,7 +323,7 @@ build_test_example-clang-8:
- cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=Debug -DUSE_Pythia8_C8=C8
- set -o pipefail
- - make -j2 install
+ - cmake --install . -- -j4
rules:
- if: $CI_MERGE_REQUEST_ID
when: manual
@@ -362,12 +362,12 @@ install-clang-8:
- cmake --build . -- -j4
- set -o pipefail
- ctest -j4
- - make -j4 install
+ - cmake --install . -- -j4
- mkdir -p build_examples
- cd build_examples
- cmake -DCMAKE_BUILT_TYPE=Release ../install/share/corsika/examples
- - make -j4
- - make -j4 run_examples | gzip -v -9 > examples.log.gz
+ - cmake --build . -- -j4
+ - cmake --build --target run_examples . -- -j4 | gzip -v -9 > examples.log.gz
rules:
- if: '$CI_MERGE_REQUEST_LABELS =~ /Ready for code review/' # run on merge requests, if label 'Ready for code review' is set
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
--
GitLab