From fdb02a7e870ef4af6bdd27e2284b6690f7c75fe9 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Tue, 25 Feb 2025 21:53:02 +0100
Subject: [PATCH] Update Gitlab-CI to clang-14 (required by Kokkos)
---
.gitlab-ci.yml | 4 ++--
.gitlab-ci/clang11-mpi-debug.yml | 15 ---------------
.gitlab-ci/clang11-mpi-release.yml | 15 ---------------
.gitlab-ci/clang14-mpi-debug.yml | 15 +++++++++++++++
.gitlab-ci/clang14-mpi-release.yml | 15 +++++++++++++++
5 files changed, 32 insertions(+), 32 deletions(-)
delete mode 100644 .gitlab-ci/clang11-mpi-debug.yml
delete mode 100644 .gitlab-ci/clang11-mpi-release.yml
create mode 100644 .gitlab-ci/clang14-mpi-debug.yml
create mode 100644 .gitlab-ci/clang14-mpi-release.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a7ed48ce..d3bb6af7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,8 @@ variables:
CTEST_OUTPUT_ON_FAILURE: 1
include:
- - local: '/.gitlab-ci/clang11-mpi-debug.yml'
- - local: '/.gitlab-ci/clang11-mpi-release.yml'
+ - local: '/.gitlab-ci/clang14-mpi-debug.yml'
+ - local: '/.gitlab-ci/clang14-mpi-release.yml'
- local: '/.gitlab-ci/gcc10-mpi-coverage.yml'
- local: '/.gitlab-ci/gcc10-mpi-release.yml'
- local: '/.gitlab-ci/gcc10-seq-coverage.yml'
diff --git a/.gitlab-ci/clang11-mpi-debug.yml b/.gitlab-ci/clang11-mpi-debug.yml
deleted file mode 100644
index 3e8ad009f..000000000
--- a/.gitlab-ci/clang11-mpi-debug.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-test:clang11-mpi-debug:
- image: localhost:5000/ubuntu_jammy_clang11_mpi
- stage: test
- needs: []
- script:
- - mkdir -p build/clang11-debug-mpi
- - cd build/clang11-debug-mpi
- - CXX=clang++-11 CC=clang-11 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- - make -j 4
- - make check
- cache:
- key: "${CI_COMMIT_REF_SLUG}-clang11-debug-mpi"
- paths:
- - build/clang11-debug-mpi
- untracked: true
diff --git a/.gitlab-ci/clang11-mpi-release.yml b/.gitlab-ci/clang11-mpi-release.yml
deleted file mode 100644
index 7c034bf86..000000000
--- a/.gitlab-ci/clang11-mpi-release.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-test:clang11-mpi-release:
- image: localhost:5000/ubuntu_jammy_clang11_mpi
- stage: test
- needs: []
- script:
- - mkdir -p build/clang11-release-mpi
- - cd build/clang11-release-mpi
- - CXX=clang++-11 CC=clang-11 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-11
- - make -j 4
- - make check
- cache:
- key: "${CI_COMMIT_REF_SLUG}-clang11-release-mpi"
- paths:
- - build/clang11-release-mpi
- untracked: true
diff --git a/.gitlab-ci/clang14-mpi-debug.yml b/.gitlab-ci/clang14-mpi-debug.yml
new file mode 100644
index 000000000..8cb332118
--- /dev/null
+++ b/.gitlab-ci/clang14-mpi-debug.yml
@@ -0,0 +1,15 @@
+test:clang11-mpi-debug:
+ image: localhost:5000/ubuntu_jammy_clang14_mpi
+ stage: test
+ needs: []
+ script:
+ - mkdir -p build/clang14-debug-mpi
+ - cd build/clang14-debug-mpi
+ - CXX=clang++-14 CC=clang-14 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
+ - make -j 4
+ - make check
+ cache:
+ key: "${CI_COMMIT_REF_SLUG}-clang11-debug-mpi"
+ paths:
+ - build/clang14-debug-mpi
+ untracked: true
diff --git a/.gitlab-ci/clang14-mpi-release.yml b/.gitlab-ci/clang14-mpi-release.yml
new file mode 100644
index 000000000..eccbc4b63
--- /dev/null
+++ b/.gitlab-ci/clang14-mpi-release.yml
@@ -0,0 +1,15 @@
+test:clang11-mpi-release:
+ image: localhost:5000/ubuntu_jammy_clang14_mpi
+ stage: test
+ needs: []
+ script:
+ - mkdir -p build/clang14-release-mpi
+ - cd build/clang14-release-mpi
+ - CXX=clang++-14 CC=clang-14 cmake ../.. -DCMAKE_BUILD_TYPE=Release
+ - make -j 4
+ - make check
+ cache:
+ key: "${CI_COMMIT_REF_SLUG}-clang14-release-mpi"
+ paths:
+ - build/clang14-release-mpi
+ untracked: true
--
GitLab