From 527a5b3975185d38300da8f9308357cf30e70890 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Sat, 15 Aug 2020 21:40:24 +0200
Subject: [PATCH] Use `needs` instructions in gitlab.ci
---
.gitlab-ci/clang10-mpi-release.yml | 4 ++--
.gitlab-ci/clang10-seq-release.yml | 4 ++--
.gitlab-ci/gcc10-seq-release.yml | 32 +++++++++++++++---------------
.gitlab-ci/gcc8-seq-dbg.yml | 4 ++--
.gitlab-ci/gcc8-seq-release.yml | 4 ++--
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml
index 6a7b914c4..cb1ffbda2 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 bfd921abd..022587e39 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 bfd921abd..525a08a80 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 b8a9d9137..4df967b28 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 516bfa2e2..ada66bc8f 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
--
GitLab