diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd394a5de592fd7266a204540871bbe172124cf8..1a2518c37fff2538991a137c95ac76429fe9bea7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -279,56 +279,6 @@ build_test-clang-8: -####### EXAMPLE (only manual) ############## - -########################################################## -# generic example template job -# normal pipeline for each commit -.example: - stage: example - tags: - - corsika - script: - - cd build - - set -o pipefail - - make -j4 run_examples | gzip -v -9 > examples.log.gz - rules: - - if: $CI_MERGE_REQUEST_ID - when: manual - - if: $CI_COMMIT_TAG - when: manual - - if: $CI_COMMIT_BRANCH - when: manual - allow_failure: true - artifacts: - when: always - expire_in: 3 days - paths: - - ${CI_PROJECT_DIR}/build/examples.log.gz - cache: - paths: - - ${CI_PROJECT_DIR}/build/ - untracked: true - policy: pull - -# example for gcc -example-u-18_04: - extends: .example - image: corsika/devel:u-18.04 - dependencies: - - build-u-18_04 - cache: - key: "${CI_COMMIT_REF_SLUG}-gcc" - -# example for clang -example-clang-8: - extends: .example - image: corsika/devel:clang-8 - dependencies: - - build-clang-8 - cache: - key: "${CI_COMMIT_REF_SLUG}-clang" - ####### BUILD-TEST-EXAMPLE (only non-Draft) ############## @@ -346,7 +296,9 @@ example-clang-8: - set -o pipefail - ctest -j4 - make install - - cd install/share/corsika/examples + - mkdir -p build_examples + - cd build_examples + - cmake ../install/share/corsika/examples - make -j4 - make -j4 run_examples | gzip -v -9 > examples.log.gz rules: @@ -365,7 +317,7 @@ example-clang-8: junit: - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml paths: - - ${CI_PROJECT_DIR}/build/install/share/corsika/examples/examples.log.gz + - ${CI_PROJECT_DIR}/build/build_examples/examples.log.gz cache: paths: - ${CI_PROJECT_DIR}/build/ @@ -458,7 +410,9 @@ install-clang-8: - set -o pipefail - ctest -j4 - make install - - cd install/share/corsika/examples + - mkdir -p build_examples + - cd build_examples + - cmake ../install/share/corsika/examples - make -j4 - make -j4 run_examples | gzip -v -9 > examples.log.gz rules: @@ -484,7 +438,7 @@ install-clang-8: junit: - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml paths: - - ${CI_PROJECT_DIR}/build/install/share/corsika/examples/examples.log.gz + - ${CI_PROJECT_DIR}/build/build_examples/examples.log.gz # release for gcc release-full-u-18_04: