From a92376a3300660f515c6b9e44a744ebf7c6b25bd Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 27 Feb 2020 14:16:17 +0100
Subject: [PATCH] [ci] Use needs: keyword for DAG.
---
scripts/ci/jobs/build-gui-linux.yml | 6 +++++-
scripts/ci/jobs/build-gui-mac.yml | 6 +++++-
scripts/ci/jobs/build-gui-win.yml | 6 +++++-
scripts/ci/jobs/checks.yml | 16 ++++++++--------
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index cf8f2dbb835..e7d334dbd21 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -1,11 +1,15 @@
build gui linux:
extends: .template-build-linux
stage: gui
+ needs:
+ - job: build linux
+ artifacts: false
rules:
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: always
- when: manual
+ allow_failure: true
variables:
BUILD_DIR: "build-gui-linux"
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index e0ada995351..5ef942411a7 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -1,13 +1,17 @@
build gui mac:
extends: .template-build-linux
stage: gui
+ needs:
+ - job: build mac
+ artifacts: false
tags:
- mac
rules:
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: always
- when: manual
+ allow_failure: true
variables:
BUILD_DIR: "build-gui-mac"
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index 9a6866fca4b..d1912391636 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -1,11 +1,15 @@
build gui win:
extends: .template-build-win
stage: gui
+ needs:
+ - job: build win
+ artifacts: false
rules:
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: always
- when: manual
+ allow_failure: true
variables:
BUILD_DIR: build-gui-win
diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml
index cc33134319b..70c84aa2381 100644
--- a/scripts/ci/jobs/checks.yml
+++ b/scripts/ci/jobs/checks.yml
@@ -3,10 +3,10 @@ compiler warnings:
variables:
GIT_STRATEGY: none
allow_failure: true
- dependencies:
- - build linux
- - build win
- - build mac
+ needs:
+ - job: build linux
+ - job: build win
+ - job: build mac
script:
- exit_code=0
- cd build
@@ -24,10 +24,10 @@ ctest results:
GIT_STRATEGY: none
tags:
- singularity
- dependencies:
- - build linux
- - build win
- - build mac
+ needs:
+ - job: build linux
+ - job: build win
+ - job: build mac
script:
- singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build/Tests/ctest.xml > build/ctest-junit.xml
- singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build-win/Tests/ctest.xml > build-win/ctest-junit.xml
--
GitLab