From 6e763f14fa5442984fc2b0a012f95b55c9696a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com>
Date: Wed, 11 Nov 2020 21:50:11 +0100
Subject: [PATCH] Change CI pipeline
- merge build and test targets: this avoids recompiling most of the
same files twice in the same conditions (build have been removed)
- remove gcc-debug targets. Actually gcc-coverage use debug options
This should lead to faster ci runs
---
.gitlab-ci.yml | 2 --
.gitlab-ci/clang10-mpi-debug.yml | 20 +++-----------------
.gitlab-ci/clang10-mpi-release.yml | 20 +++-----------------
.gitlab-ci/gcc10-mpi-coverage.yml | 3 ++-
.gitlab-ci/gcc10-mpi-debug.yml | 29 -----------------------------
.gitlab-ci/gcc10-mpi-release.yml | 18 ++----------------
.gitlab-ci/gcc10-seq-coverage.yml | 3 ++-
.gitlab-ci/gcc10-seq-release.yml | 20 +++-----------------
8 files changed, 15 insertions(+), 100 deletions(-)
delete mode 100644 .gitlab-ci/gcc10-mpi-debug.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d9b64f0f..02c2d48ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
stages:
- - build
- test
- coverage
@@ -9,7 +8,6 @@ variables:
include:
- local: '/.gitlab-ci/clang10-mpi-debug.yml'
- local: '/.gitlab-ci/clang10-mpi-release.yml'
- - local: '/.gitlab-ci/gcc10-mpi-debug.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
index c9152e7ed..ceafce232 100644
--- a/.gitlab-ci/clang10-mpi-debug.yml
+++ b/.gitlab-ci/clang10-mpi-debug.yml
@@ -1,27 +1,13 @@
-build:clang10-mpi-debug:
- image: localhost:5000/ubuntu_clang10_mpi
- stage: build
- 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 pugs
- cache:
- key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
- paths:
- - build/clang10-debug-mpi
- untracked: true
-
test:clang10-mpi-debug:
image: localhost:5000/ubuntu_clang10_mpi
stage: test
- needs: ["build:clang10-mpi-debug"]
+ 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 test
+ - make
+ - make check
cache:
key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
paths:
diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml
index ebe76ce67..58a2d2d2e 100644
--- a/.gitlab-ci/clang10-mpi-release.yml
+++ b/.gitlab-ci/clang10-mpi-release.yml
@@ -1,27 +1,13 @@
-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
- - 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
- needs: ["build:clang10-mpi-release"]
+ 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 test
+ - make
+ - make check
cache:
key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi"
paths:
diff --git a/.gitlab-ci/gcc10-mpi-coverage.yml b/.gitlab-ci/gcc10-mpi-coverage.yml
index 156592e9f..f09cb1b30 100644
--- a/.gitlab-ci/gcc10-mpi-coverage.yml
+++ b/.gitlab-ci/gcc10-mpi-coverage.yml
@@ -1,11 +1,12 @@
coverage:gcc10-mpi-coverage:
image: localhost:5000/ubuntu_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 pugs
+ - make
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-cov-mpi"
diff --git a/.gitlab-ci/gcc10-mpi-debug.yml b/.gitlab-ci/gcc10-mpi-debug.yml
deleted file mode 100644
index c29467b2a..000000000
--- a/.gitlab-ci/gcc10-mpi-debug.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-build:gcc10-mpi-debug:
- image: localhost:5000/ubuntu_gcc10_mpi
- stage: build
- needs: []
- script:
- - mkdir -p build/gcc10-debug-mpi
- - cd build/gcc10-debug-mpi
- - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- - make pugs
- cache:
- key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
- paths:
- - build/gcc10-debug-mpi
- untracked: true
-
-test:gcc10-mpi-debug:
- image: localhost:5000/ubuntu_gcc10_mpi
- stage: test
- needs: ["build:gcc10-mpi-debug"]
- script:
- - mkdir -p build/gcc10-debug-mpi
- - cd build/gcc10-debug-mpi
- - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- - make test
- cache:
- key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
- paths:
- - build/gcc10-debug-mpi
- untracked: true
diff --git a/.gitlab-ci/gcc10-mpi-release.yml b/.gitlab-ci/gcc10-mpi-release.yml
index 027d5e115..5e8277ad6 100644
--- a/.gitlab-ci/gcc10-mpi-release.yml
+++ b/.gitlab-ci/gcc10-mpi-release.yml
@@ -1,26 +1,12 @@
-build:gcc10-mpi-release:
- image: localhost:5000/ubuntu_gcc10_mpi
- stage: build
- 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 pugs
- cache:
- key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
- paths:
- - build/gcc10-release-mpi
- untracked: true
-
test:gcc10-mpi-release:
image: localhost:5000/ubuntu_gcc10_mpi
stage: test
- needs: ["build:gcc10-mpi-release"]
+ 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
- make test
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
diff --git a/.gitlab-ci/gcc10-seq-coverage.yml b/.gitlab-ci/gcc10-seq-coverage.yml
index 663798274..ba80263a3 100644
--- a/.gitlab-ci/gcc10-seq-coverage.yml
+++ b/.gitlab-ci/gcc10-seq-coverage.yml
@@ -1,11 +1,12 @@
coverage:gcc10-seq-coverage:
image: localhost:5000/ubuntu_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 pugs
+ - make
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-cov"
diff --git a/.gitlab-ci/gcc10-seq-release.yml b/.gitlab-ci/gcc10-seq-release.yml
index 8370c4684..b4423bbd3 100644
--- a/.gitlab-ci/gcc10-seq-release.yml
+++ b/.gitlab-ci/gcc10-seq-release.yml
@@ -1,27 +1,13 @@
-build:gcc10-seq-release:
- image: localhost:5000/ubuntu_gcc10
- stage: build
- 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 pugs
- cache:
- key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
- paths:
- - build/gcc10-release-seq
- untracked: true
-
test:gcc10-seq-release:
image: localhost:5000/ubuntu_gcc10
stage: test
- needs: ["build:gcc10-seq-release"]
+ 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 test
+ - make
+ - make check
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
paths:
--
GitLab