diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3bb6af7c80ced92b56959d5942bfa75700e6cbe..2e9d2af7fcbb02c0ad1225a009f10a33589c2aaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: include: - 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' - - local: '/.gitlab-ci/gcc10-seq-release.yml' + - local: '/.gitlab-ci/gcc11-mpi-coverage.yml' + - local: '/.gitlab-ci/gcc11-mpi-release.yml' + - local: '/.gitlab-ci/gcc11-seq-coverage.yml' + - local: '/.gitlab-ci/gcc11-seq-release.yml' diff --git a/.gitlab-ci/gcc10-mpi-coverage.yml b/.gitlab-ci/gcc10-mpi-coverage.yml deleted file mode 100644 index e3b178d1a09872ca53a176a4f425fc045f4189ac..0000000000000000000000000000000000000000 --- a/.gitlab-ci/gcc10-mpi-coverage.yml +++ /dev/null @@ -1,15 +0,0 @@ -coverage:gcc10-mpi-coverage: - image: localhost:5000/ubuntu_jammy_gcc10_mpi - stage: coverage - needs: [] - script: - - mkdir -p build/gcc10-cov-mpi - - cd build/gcc10-cov-mpi - - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage - - make -j 4 - cache: - key: "${CI_COMMIT_REF_SLUG}-gcc10-cov-mpi" - paths: - - build/gcc10-cov-mpi - untracked: true - coverage: '/^\s*Total:\|(\d*\.\d|\d*)\%.*$/' diff --git a/.gitlab-ci/gcc10-mpi-release.yml b/.gitlab-ci/gcc10-mpi-release.yml deleted file mode 100644 index ef5be1ee55aff915acf4767ba0f5c1a9af1161de..0000000000000000000000000000000000000000 --- a/.gitlab-ci/gcc10-mpi-release.yml +++ /dev/null @@ -1,15 +0,0 @@ -test:gcc10-mpi-release: - image: localhost:5000/ubuntu_jammy_gcc10_mpi - stage: test - needs: [] - script: - - mkdir -p build/gcc10-release-mpi - - cd build/gcc10-release-mpi - - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release - - make -j 4 - - make test - cache: - key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi" - paths: - - build/gcc10-release-mpi - untracked: true diff --git a/.gitlab-ci/gcc10-seq-coverage.yml b/.gitlab-ci/gcc10-seq-coverage.yml deleted file mode 100644 index 96c5a3b79cc7dbb6a11b57bf71715432be16e3c7..0000000000000000000000000000000000000000 --- a/.gitlab-ci/gcc10-seq-coverage.yml +++ /dev/null @@ -1,15 +0,0 @@ -coverage:gcc10-seq-coverage: - image: localhost:5000/ubuntu_jammy_gcc10 - stage: coverage - needs: [] - script: - - mkdir -p build/gcc10-cov - - cd build/gcc10-cov - - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage - - make -j 4 - cache: - key: "${CI_COMMIT_REF_SLUG}-gcc10-cov" - paths: - - build/gcc10-cov - untracked: true - coverage: '/^\s*Total:\|(\d*\.\d|\d*)\%.*$/' diff --git a/.gitlab-ci/gcc10-seq-release.yml b/.gitlab-ci/gcc10-seq-release.yml deleted file mode 100644 index 298124599f0aeb166af9e4d8b8d2a00ffc694924..0000000000000000000000000000000000000000 --- a/.gitlab-ci/gcc10-seq-release.yml +++ /dev/null @@ -1,15 +0,0 @@ -test:gcc10-seq-release: - image: localhost:5000/ubuntu_jammy_gcc10 - stage: test - needs: [] - script: - - mkdir -p build/gcc10-release-seq - - cd build/gcc10-release-seq - - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release - - make -j 4 - - make check - cache: - key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq" - paths: - - build/gcc10-release-seq - untracked: true diff --git a/.gitlab-ci/gcc11-mpi-coverage.yml b/.gitlab-ci/gcc11-mpi-coverage.yml new file mode 100644 index 0000000000000000000000000000000000000000..2dd34336bf85c664360c8411024af2ab3383447c --- /dev/null +++ b/.gitlab-ci/gcc11-mpi-coverage.yml @@ -0,0 +1,15 @@ +coverage:gcc11-mpi-coverage: + image: localhost:5000/ubuntu_jammy_gcc11_mpi + stage: coverage + needs: [] + script: + - mkdir -p build/gcc11-cov-mpi + - cd build/gcc11-cov-mpi + - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage + - make -j 4 + cache: + key: "${CI_COMMIT_REF_SLUG}-gcc11-cov-mpi" + paths: + - build/gcc11-cov-mpi + untracked: true + coverage: '/^\s*Total:\|(\d*\.\d|\d*)\%.*$/' diff --git a/.gitlab-ci/gcc11-mpi-release.yml b/.gitlab-ci/gcc11-mpi-release.yml new file mode 100644 index 0000000000000000000000000000000000000000..0d3fcfd469ce4e0e9072543be502274dcf50c1b7 --- /dev/null +++ b/.gitlab-ci/gcc11-mpi-release.yml @@ -0,0 +1,15 @@ +test:gcc11-mpi-release: + image: localhost:5000/ubuntu_jammy_gcc11_mpi + stage: test + needs: [] + script: + - mkdir -p build/gcc11-release-mpi + - cd build/gcc11-release-mpi + - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Release + - make -j 4 + - make test + cache: + key: "${CI_COMMIT_REF_SLUG}-gcc11-release-mpi" + paths: + - build/gcc11-release-mpi + untracked: true diff --git a/.gitlab-ci/gcc11-seq-coverage.yml b/.gitlab-ci/gcc11-seq-coverage.yml new file mode 100644 index 0000000000000000000000000000000000000000..133679ddfcd5e641981c0fa40fd59819f1f7e585 --- /dev/null +++ b/.gitlab-ci/gcc11-seq-coverage.yml @@ -0,0 +1,15 @@ +coverage:gcc11-seq-coverage: + image: localhost:5000/ubuntu_jammy_gcc11 + stage: coverage + needs: [] + script: + - mkdir -p build/gcc11-cov + - cd build/gcc11-cov + - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage + - make -j 4 + cache: + key: "${CI_COMMIT_REF_SLUG}-gcc11-cov" + paths: + - build/gcc11-cov + untracked: true + coverage: '/^\s*Total:\|(\d*\.\d|\d*)\%.*$/' diff --git a/.gitlab-ci/gcc11-seq-release.yml b/.gitlab-ci/gcc11-seq-release.yml new file mode 100644 index 0000000000000000000000000000000000000000..20cdeb1d48f331625469899f76999a7bbea9acad --- /dev/null +++ b/.gitlab-ci/gcc11-seq-release.yml @@ -0,0 +1,15 @@ +test:gcc11-seq-release: + image: localhost:5000/ubuntu_jammy_gcc11 + stage: test + needs: [] + script: + - mkdir -p build/gcc11-release-seq + - cd build/gcc11-release-seq + - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Release + - make -j 4 + - make check + cache: + key: "${CI_COMMIT_REF_SLUG}-gcc11-release-seq" + paths: + - build/gcc11-release-seq + untracked: true