From cfc8757b3af7e9ce305949ac6f5586699c0e11b1 Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Tue, 21 Jul 2020 23:37:50 +0200 Subject: [PATCH] Switch CI to clang-10 Also to satisfy <filesystem> include add linking to stdc++fs --- .gitlab-ci.yml | 9 ++++----- .gitlab-ci/clang10-mpi-coverage.yml | 14 ++++++++++++++ .gitlab-ci/clang10-mpi-release.yml | 29 +++++++++++++++++++++++++++++ .gitlab-ci/clang10-seq-coverage.yml | 14 ++++++++++++++ .gitlab-ci/clang10-seq-release.yml | 29 +++++++++++++++++++++++++++++ .gitlab-ci/clang8-mpi-coverage.yml | 14 -------------- .gitlab-ci/clang8-mpi-release.yml | 29 ----------------------------- .gitlab-ci/clang8-seq-coverage.yml | 14 -------------- .gitlab-ci/clang8-seq-release.yml | 29 ----------------------------- CMakeLists.txt | 1 + 10 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 .gitlab-ci/clang10-mpi-coverage.yml create mode 100644 .gitlab-ci/clang10-mpi-release.yml create mode 100644 .gitlab-ci/clang10-seq-coverage.yml create mode 100644 .gitlab-ci/clang10-seq-release.yml delete mode 100644 .gitlab-ci/clang8-mpi-coverage.yml delete mode 100644 .gitlab-ci/clang8-mpi-release.yml delete mode 100644 .gitlab-ci/clang8-seq-coverage.yml delete mode 100644 .gitlab-ci/clang8-seq-release.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f4bec564..dd8e7d636 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,7 @@ variables: include: - local: '/.gitlab-ci/gcc8-seq-dbg.yml' - local: '/.gitlab-ci/gcc8-seq-release.yml' -# - local: '/.gitlab-ci/gcc8-seq-coverage.yml' - - local: '/.gitlab-ci/clang8-seq-release.yml' - - local: '/.gitlab-ci/clang8-mpi-release.yml' - - local: '/.gitlab-ci/clang8-seq-coverage.yml' - - local: '/.gitlab-ci/clang8-mpi-coverage.yml' + - local: '/.gitlab-ci/clang10-seq-release.yml' + - local: '/.gitlab-ci/clang10-mpi-release.yml' + - local: '/.gitlab-ci/clang10-seq-coverage.yml' + - local: '/.gitlab-ci/clang10-mpi-coverage.yml' diff --git a/.gitlab-ci/clang10-mpi-coverage.yml b/.gitlab-ci/clang10-mpi-coverage.yml new file mode 100644 index 000000000..8d18ed109 --- /dev/null +++ b/.gitlab-ci/clang10-mpi-coverage.yml @@ -0,0 +1,14 @@ +coverage:clang10-mpi-coverage: + image: localhost:5000/ubuntu_clang10_mpi + stage: coverage + script: + - mkdir -p build/clang10-cov-mpi + - cd build/clang10-cov-mpi + - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-10 + - make pugs + - make coverage + cache: + key: "${CI_COMMIT_REF_SLUG}-clang10-cov-mpi" + paths: + - build/clang10-cov-mpi + untracked: true diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml new file mode 100644 index 000000000..6a7b914c4 --- /dev/null +++ b/.gitlab-ci/clang10-mpi-release.yml @@ -0,0 +1,29 @@ +build:clang10-mpi-release: + image: localhost:5000/ubuntu_clang10_mpi + stage: build + script: + - mkdir -p build/clang10-release-mpi + - cd build/clang10-release-mpi + - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10 + - make pugs + cache: + key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi" + paths: + - build/clang10-release-mpi + untracked: true + +test:clang10-mpi-release: + image: localhost:5000/ubuntu_clang10_mpi + stage: test + dependencies: + - build:clang10-mpi-release + script: + - mkdir -p build/clang10-release-mpi + - cd build/clang10-release-mpi + - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10 + - make run_unit_tests + cache: + key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi" + paths: + - build/clang10-release-mpi + untracked: true diff --git a/.gitlab-ci/clang10-seq-coverage.yml b/.gitlab-ci/clang10-seq-coverage.yml new file mode 100644 index 000000000..c9bb772d6 --- /dev/null +++ b/.gitlab-ci/clang10-seq-coverage.yml @@ -0,0 +1,14 @@ +coverage:clang10-seq-coverage: + image: localhost:5000/ubuntu_clang10 + stage: coverage + script: + - mkdir -p build/clang10-cov + - cd build/clang10-cov + - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-10 + - make pugs + - make coverage + cache: + key: "${CI_COMMIT_REF_SLUG}-clang10-cov" + paths: + - build/clang10-cov + untracked: true diff --git a/.gitlab-ci/clang10-seq-release.yml b/.gitlab-ci/clang10-seq-release.yml new file mode 100644 index 000000000..bfd921abd --- /dev/null +++ b/.gitlab-ci/clang10-seq-release.yml @@ -0,0 +1,29 @@ +build:clang10-seq-release: + image: localhost:5000/ubuntu_clang10 + stage: build + script: + - mkdir -p build/clang10-release-seq + - cd build/clang10-release-seq + - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10 + - make pugs + cache: + key: "${CI_COMMIT_REF_SLUG}-clang10-release-seq" + paths: + - build/clang10-release-seq + untracked: true + +test:clang10-seq-release: + image: localhost:5000/ubuntu_clang10 + stage: test + dependencies: + - build:clang10-seq-release + script: + - mkdir -p build/clang10-release-seq + - cd build/clang10-release-seq + - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10 + - make run_unit_tests + cache: + key: "${CI_COMMIT_REF_SLUG}-clang10-release-seq" + paths: + - build/clang10-release-seq + untracked: true diff --git a/.gitlab-ci/clang8-mpi-coverage.yml b/.gitlab-ci/clang8-mpi-coverage.yml deleted file mode 100644 index 34d8c1322..000000000 --- a/.gitlab-ci/clang8-mpi-coverage.yml +++ /dev/null @@ -1,14 +0,0 @@ -coverage:clang8-mpi-coverage: - image: localhost:5000/ubuntu_clang8_mpi - stage: coverage - script: - - mkdir -p build/clang8-cov-mpi - - 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 - - make coverage - cache: - key: "${CI_COMMIT_REF_SLUG}-clang8-cov-mpi" - paths: - - build/clang8-cov-mpi - untracked: true diff --git a/.gitlab-ci/clang8-mpi-release.yml b/.gitlab-ci/clang8-mpi-release.yml deleted file mode 100644 index 92f03c34e..000000000 --- a/.gitlab-ci/clang8-mpi-release.yml +++ /dev/null @@ -1,29 +0,0 @@ -build:clang8-mpi-release: - image: localhost:5000/ubuntu_clang8_mpi - stage: build - 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 pugs - cache: - key: "${CI_COMMIT_REF_SLUG}-clang8-release-mpi" - paths: - - build/clang8-release-mpi - untracked: true - -test:clang8-mpi-release: - image: localhost:5000/ubuntu_clang8_mpi - stage: test - dependencies: - - build: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" - paths: - - build/clang8-release-mpi - untracked: true diff --git a/.gitlab-ci/clang8-seq-coverage.yml b/.gitlab-ci/clang8-seq-coverage.yml deleted file mode 100644 index b7e407188..000000000 --- a/.gitlab-ci/clang8-seq-coverage.yml +++ /dev/null @@ -1,14 +0,0 @@ -coverage:clang8-seq-coverage: - image: localhost:5000/ubuntu_clang8 - stage: coverage - script: - - mkdir -p build/clang8-cov - - cd build/clang8-cov - - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-8 - - make pugs - - make coverage - cache: - key: "${CI_COMMIT_REF_SLUG}-clang8-cov" - paths: - - build/clang8-cov - untracked: true diff --git a/.gitlab-ci/clang8-seq-release.yml b/.gitlab-ci/clang8-seq-release.yml deleted file mode 100644 index acdc43a3e..000000000 --- a/.gitlab-ci/clang8-seq-release.yml +++ /dev/null @@ -1,29 +0,0 @@ -build:clang8-seq-release: - image: localhost:5000/ubuntu_clang8 - stage: build - 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 pugs - cache: - key: "${CI_COMMIT_REF_SLUG}-clang8-release-seq" - paths: - - build/clang8-release-seq - untracked: true - -test:clang8-seq-release: - image: localhost:5000/ubuntu_clang8 - stage: test - dependencies: - - build: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" - paths: - - build/clang8-release-seq - untracked: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 58fc97c45..127b72af3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,6 +434,7 @@ target_link_libraries( ${KOKKOS_CXX_FLAGS} ${OPENMP_LINK_FLAGS} ${PUGS_STD_LINK_FLAGS} + stdc++fs ) # ---------------------- Doxygen ---------------------- -- GitLab