From 2a5734e2153a28c42a2b15577472846730860036 Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Tue, 21 May 2019 23:33:13 +0200 Subject: [PATCH] Force cmake invocation to deal with cleaned cache --- .gitlab-ci/clang8-mpi-release.yml | 1 + .gitlab-ci/clang8-seq-release.yml | 1 + .gitlab-ci/gcc8-seq-dbg.yml | 1 + .gitlab-ci/gcc8-seq-release.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.gitlab-ci/clang8-mpi-release.yml b/.gitlab-ci/clang8-mpi-release.yml index c76d029cb..92f03c34e 100644 --- a/.gitlab-ci/clang8-mpi-release.yml +++ b/.gitlab-ci/clang8-mpi-release.yml @@ -20,6 +20,7 @@ test:clang8-mpi-release: script: - mkdir -p build/clang8-release-mpi - cd build/clang8-release-mpi + - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-8 - make run_unit_tests cache: key: "${CI_COMMIT_REF_SLUG}-clang8-release-mpi" diff --git a/.gitlab-ci/clang8-seq-release.yml b/.gitlab-ci/clang8-seq-release.yml index 6316b2223..acdc43a3e 100644 --- a/.gitlab-ci/clang8-seq-release.yml +++ b/.gitlab-ci/clang8-seq-release.yml @@ -20,6 +20,7 @@ test:clang8-seq-release: script: - mkdir -p build/clang8-release-seq - cd build/clang8-release-seq + - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-8 - make run_unit_tests cache: key: "${CI_COMMIT_REF_SLUG}-clang8-release-seq" diff --git a/.gitlab-ci/gcc8-seq-dbg.yml b/.gitlab-ci/gcc8-seq-dbg.yml index 441fcf5a6..b8a9d9137 100644 --- a/.gitlab-ci/gcc8-seq-dbg.yml +++ b/.gitlab-ci/gcc8-seq-dbg.yml @@ -20,6 +20,7 @@ test:gcc8-seq-dbg: script: - mkdir -p build/gcc8-seq-dbg - cd build/gcc8-seq-dbg + - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Debug - make run_unit_tests cache: key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-dbg" diff --git a/.gitlab-ci/gcc8-seq-release.yml b/.gitlab-ci/gcc8-seq-release.yml index 7453a9da6..516bfa2e2 100644 --- a/.gitlab-ci/gcc8-seq-release.yml +++ b/.gitlab-ci/gcc8-seq-release.yml @@ -20,6 +20,7 @@ test:gcc8-seq-release: script: - mkdir -p build/gcc8-seq-release - cd build/gcc8-seq-release + - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release - make run_unit_tests cache: key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-release" -- GitLab