diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml index 6a7b914c42d5122c8fcdd5b2d1229185658e80c7..cb1ffbda2ddc3bbed30f03d2caa4f0c8e45629c6 100644 --- a/.gitlab-ci/clang10-mpi-release.yml +++ b/.gitlab-ci/clang10-mpi-release.yml @@ -1,6 +1,7 @@ build:clang10-mpi-release: image: localhost:5000/ubuntu_clang10_mpi stage: build + needs: [] script: - mkdir -p build/clang10-release-mpi - cd build/clang10-release-mpi @@ -15,8 +16,7 @@ build:clang10-mpi-release: test:clang10-mpi-release: image: localhost:5000/ubuntu_clang10_mpi stage: test - dependencies: - - build:clang10-mpi-release + needs: ["build:clang10-mpi-release"] script: - mkdir -p build/clang10-release-mpi - cd build/clang10-release-mpi diff --git a/.gitlab-ci/clang10-seq-release.yml b/.gitlab-ci/clang10-seq-release.yml index bfd921abdd8b60a7fcb273d55a7821ace695bbeb..022587e3993f275f37983d59a4b189900673327e 100644 --- a/.gitlab-ci/clang10-seq-release.yml +++ b/.gitlab-ci/clang10-seq-release.yml @@ -1,6 +1,7 @@ build:clang10-seq-release: image: localhost:5000/ubuntu_clang10 stage: build + needs: [] script: - mkdir -p build/clang10-release-seq - cd build/clang10-release-seq @@ -15,8 +16,7 @@ build:clang10-seq-release: test:clang10-seq-release: image: localhost:5000/ubuntu_clang10 stage: test - dependencies: - - build:clang10-seq-release + needs: ["build:clang10-seq-release"] script: - mkdir -p build/clang10-release-seq - cd build/clang10-release-seq diff --git a/.gitlab-ci/gcc10-seq-release.yml b/.gitlab-ci/gcc10-seq-release.yml index bfd921abdd8b60a7fcb273d55a7821ace695bbeb..525a08a80f295df5a8e766304279b79cd3fef4b0 100644 --- a/.gitlab-ci/gcc10-seq-release.yml +++ b/.gitlab-ci/gcc10-seq-release.yml @@ -1,29 +1,29 @@ -build:clang10-seq-release: - image: localhost:5000/ubuntu_clang10 +build:gcc10-seq-release: + image: localhost:5000/ubuntu_gcc10 stage: build + needs: [] 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 + - mkdir -p build/gcc10-release-seq + - cd build/gcc10-release-seq + - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release - make pugs cache: - key: "${CI_COMMIT_REF_SLUG}-clang10-release-seq" + key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq" paths: - - build/clang10-release-seq + - build/gcc10-release-seq untracked: true -test:clang10-seq-release: - image: localhost:5000/ubuntu_clang10 +test:gcc10-seq-release: + image: localhost:5000/ubuntu_gcc10 stage: test - dependencies: - - build:clang10-seq-release + needs: ["build:gcc10-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 + - mkdir -p build/gcc10-release-seq + - cd build/gcc10-release-seq + - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release - make run_unit_tests cache: - key: "${CI_COMMIT_REF_SLUG}-clang10-release-seq" + key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq" paths: - - build/clang10-release-seq + - build/gcc10-release-seq untracked: true diff --git a/.gitlab-ci/gcc8-seq-dbg.yml b/.gitlab-ci/gcc8-seq-dbg.yml index b8a9d91379064a24bde84b873adbf717d8380503..4df967b28c0cb1137efd1762368149cccb360767 100644 --- a/.gitlab-ci/gcc8-seq-dbg.yml +++ b/.gitlab-ci/gcc8-seq-dbg.yml @@ -1,6 +1,7 @@ build:gcc8-seq-dbg: image: localhost:5000/ubuntu_gcc8 stage: build + needs: [] script: - mkdir -p build/gcc8-seq-dbg - cd build/gcc8-seq-dbg @@ -15,8 +16,7 @@ build:gcc8-seq-dbg: test:gcc8-seq-dbg: image: localhost:5000/ubuntu_gcc8 stage: test - dependencies: - - build:gcc8-seq-dbg + needs: ["build:gcc8-seq-dbg"] script: - mkdir -p build/gcc8-seq-dbg - cd build/gcc8-seq-dbg diff --git a/.gitlab-ci/gcc8-seq-release.yml b/.gitlab-ci/gcc8-seq-release.yml index 516bfa2e2f4ceb0656a2394f7f0b3b50acf96d86..ada66bc8f920739da9e700af4475df0858f3b25c 100644 --- a/.gitlab-ci/gcc8-seq-release.yml +++ b/.gitlab-ci/gcc8-seq-release.yml @@ -1,6 +1,7 @@ build:gcc8-seq-release: image: localhost:5000/ubuntu_gcc8 stage: build + needs: [] script: - mkdir -p build/gcc8-seq-release - cd build/gcc8-seq-release @@ -15,8 +16,7 @@ build:gcc8-seq-release: test:gcc8-seq-release: image: localhost:5000/ubuntu_gcc8 stage: test - dependencies: - - build:gcc8-seq-release + needs: ["build:gcc8-seq-release"] script: - mkdir -p build/gcc8-seq-release - cd build/gcc8-seq-release