diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02c2d48ced6eb3f1e1c106f5d00e010b258fee3c..1a7ed48ce5254d358ee9c449843f879168c0e24b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ variables: CTEST_OUTPUT_ON_FAILURE: 1 include: - - local: '/.gitlab-ci/clang10-mpi-debug.yml' - - local: '/.gitlab-ci/clang10-mpi-release.yml' + - local: '/.gitlab-ci/clang11-mpi-debug.yml' + - local: '/.gitlab-ci/clang11-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/clang10-mpi-debug.yml b/.gitlab-ci/clang10-mpi-debug.yml deleted file mode 100644 index a757e02d46b81e60e981c0d3d11aaa8058c6fcab..0000000000000000000000000000000000000000 --- a/.gitlab-ci/clang10-mpi-debug.yml +++ /dev/null @@ -1,15 +0,0 @@ -test:clang10-mpi-debug: - image: localhost:5000/ubuntu_clang10_mpi - stage: test - needs: [] - script: - - mkdir -p build/clang10-debug-mpi - - cd build/clang10-debug-mpi - - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug - - make -j 4 - - make check - cache: - key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi" - paths: - - build/clang10-debug-mpi - untracked: true diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml deleted file mode 100644 index 3172c1c2c5f869e1e44153956cfde696adb6b05d..0000000000000000000000000000000000000000 --- a/.gitlab-ci/clang10-mpi-release.yml +++ /dev/null @@ -1,15 +0,0 @@ -test:clang10-mpi-release: - image: localhost:5000/ubuntu_clang10_mpi - stage: test - needs: [] - 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 -j 4 - - make check - cache: - key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi" - paths: - - build/clang10-release-mpi - untracked: true diff --git a/.gitlab-ci/clang11-mpi-debug.yml b/.gitlab-ci/clang11-mpi-debug.yml new file mode 100644 index 0000000000000000000000000000000000000000..3e8ad009fe9d78f6a3b1d662c4dec253514b0641 --- /dev/null +++ b/.gitlab-ci/clang11-mpi-debug.yml @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..7c034bf86fb1062a4847c81f79275189f5a51e7b --- /dev/null +++ b/.gitlab-ci/clang11-mpi-release.yml @@ -0,0 +1,15 @@ +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/gcc10-mpi-coverage.yml b/.gitlab-ci/gcc10-mpi-coverage.yml index 9881eb7d15161bb5c6cda4786b8e2b43cde77e50..e3b178d1a09872ca53a176a4f425fc045f4189ac 100644 --- a/.gitlab-ci/gcc10-mpi-coverage.yml +++ b/.gitlab-ci/gcc10-mpi-coverage.yml @@ -1,5 +1,5 @@ coverage:gcc10-mpi-coverage: - image: localhost:5000/ubuntu_gcc10_mpi + image: localhost:5000/ubuntu_jammy_gcc10_mpi stage: coverage needs: [] script: diff --git a/.gitlab-ci/gcc10-mpi-release.yml b/.gitlab-ci/gcc10-mpi-release.yml index 198fe1785140889fb65d54e3fbdc4f9fe8ba94af..ef5be1ee55aff915acf4767ba0f5c1a9af1161de 100644 --- a/.gitlab-ci/gcc10-mpi-release.yml +++ b/.gitlab-ci/gcc10-mpi-release.yml @@ -1,5 +1,5 @@ test:gcc10-mpi-release: - image: localhost:5000/ubuntu_gcc10_mpi + image: localhost:5000/ubuntu_jammy_gcc10_mpi stage: test needs: [] script: diff --git a/.gitlab-ci/gcc10-seq-coverage.yml b/.gitlab-ci/gcc10-seq-coverage.yml index 421d47af55a010a9f47480e0fe349bffc980e264..96c5a3b79cc7dbb6a11b57bf71715432be16e3c7 100644 --- a/.gitlab-ci/gcc10-seq-coverage.yml +++ b/.gitlab-ci/gcc10-seq-coverage.yml @@ -1,5 +1,5 @@ coverage:gcc10-seq-coverage: - image: localhost:5000/ubuntu_gcc10 + image: localhost:5000/ubuntu_jammy_gcc10 stage: coverage needs: [] script: diff --git a/.gitlab-ci/gcc10-seq-release.yml b/.gitlab-ci/gcc10-seq-release.yml index 8a34f11b0dea3b4df56a2e8883c8d08245ddac2c..298124599f0aeb166af9e4d8b8d2a00ffc694924 100644 --- a/.gitlab-ci/gcc10-seq-release.yml +++ b/.gitlab-ci/gcc10-seq-release.yml @@ -1,5 +1,5 @@ test:gcc10-seq-release: - image: localhost:5000/ubuntu_gcc10 + image: localhost:5000/ubuntu_jammy_gcc10 stage: test needs: [] script: