From c37f8cba8de4c51118016765da553f223fdaa8df Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Tue, 21 May 2019 23:10:40 +0200 Subject: [PATCH] Rework CI pipeline - coverage is now performed as 1 step (getting rid of cache/artifacts mess at the moment) - unit tests run now ensures that build-dir exists (again to avoid cache/artifacts troubleshooting) Cache/artifacts may be useful when dealing with integration tests but it should be better to keep things simple by now --- .gitlab-ci/clang8-mpi-coverage.yml | 13 ------------- .gitlab-ci/clang8-mpi-release.yml | 1 + .gitlab-ci/clang8-seq-coverage.yml | 13 ------------- .gitlab-ci/clang8-seq-release.yml | 1 + .gitlab-ci/gcc8-seq-dbg.yml | 1 + .gitlab-ci/gcc8-seq-release.yml | 1 + 6 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci/clang8-mpi-coverage.yml b/.gitlab-ci/clang8-mpi-coverage.yml index a299e0483..8467eacbb 100644 --- a/.gitlab-ci/clang8-mpi-coverage.yml +++ b/.gitlab-ci/clang8-mpi-coverage.yml @@ -6,19 +6,6 @@ build:clang8-mpi-coverage: - cd build/clang8-cov-mpi - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-8 - make pugs - cache: - key: "${CI_COMMIT_REF_SLUG}-clang8-cov-mpi" - paths: - - build/clang8-cov-mpi - untracked: true - -test:clang8-mpi-coverage: - image: localhost:5000/ubuntu_clang8_mpi - stage: test - dependencies: - - build:clang8-mpi-coverage - script: - - cd build/clang8-cov-mpi - make coverage cache: key: "${CI_COMMIT_REF_SLUG}-clang8-cov-mpi" diff --git a/.gitlab-ci/clang8-mpi-release.yml b/.gitlab-ci/clang8-mpi-release.yml index 1191266ac..c76d029cb 100644 --- a/.gitlab-ci/clang8-mpi-release.yml +++ b/.gitlab-ci/clang8-mpi-release.yml @@ -18,6 +18,7 @@ test:clang8-mpi-release: dependencies: - build:clang8-mpi-release script: + - mkdir -p build/clang8-release-mpi - cd build/clang8-release-mpi - make run_unit_tests cache: diff --git a/.gitlab-ci/clang8-seq-coverage.yml b/.gitlab-ci/clang8-seq-coverage.yml index a79f27cb4..aa2a4715e 100644 --- a/.gitlab-ci/clang8-seq-coverage.yml +++ b/.gitlab-ci/clang8-seq-coverage.yml @@ -6,19 +6,6 @@ build:clang8-seq-coverage: - cd build/clang8-cov - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-8 - make pugs - cache: - key: "${CI_COMMIT_REF_SLUG}-clang8-cov" - paths: - - build/clang8-cov - untracked: true - -test:clang8-seq-coverage: - image: localhost:5000/ubuntu_clang8 - stage: test - dependencies: - - build:clang8-seq-coverage - script: - - cd build/clang8-cov - make coverage cache: key: "${CI_COMMIT_REF_SLUG}-clang8-cov" diff --git a/.gitlab-ci/clang8-seq-release.yml b/.gitlab-ci/clang8-seq-release.yml index c12c05664..6316b2223 100644 --- a/.gitlab-ci/clang8-seq-release.yml +++ b/.gitlab-ci/clang8-seq-release.yml @@ -18,6 +18,7 @@ test:clang8-seq-release: dependencies: - build:clang8-seq-release script: + - mkdir -p build/clang8-release-seq - cd build/clang8-release-seq - make run_unit_tests cache: diff --git a/.gitlab-ci/gcc8-seq-dbg.yml b/.gitlab-ci/gcc8-seq-dbg.yml index fb3f5d03f..441fcf5a6 100644 --- a/.gitlab-ci/gcc8-seq-dbg.yml +++ b/.gitlab-ci/gcc8-seq-dbg.yml @@ -18,6 +18,7 @@ test:gcc8-seq-dbg: dependencies: - build:gcc8-seq-dbg script: + - mkdir -p build/gcc8-seq-dbg - cd build/gcc8-seq-dbg - make run_unit_tests cache: diff --git a/.gitlab-ci/gcc8-seq-release.yml b/.gitlab-ci/gcc8-seq-release.yml index eecb64a12..7453a9da6 100644 --- a/.gitlab-ci/gcc8-seq-release.yml +++ b/.gitlab-ci/gcc8-seq-release.yml @@ -18,6 +18,7 @@ test:gcc8-seq-release: dependencies: - build:gcc8-seq-release script: + - mkdir -p build/gcc8-seq-release - cd build/gcc8-seq-release - make run_unit_tests cache: -- GitLab