From fb18772f131deef626437b6c51829eedd2f4c6dd Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 20 Feb 2020 15:43:21 +0100
Subject: [PATCH] [ci] Added defaults template which disables artifacts
passing.
---
.gitlab-ci.yml | 1 +
scripts/ci/extends/build-win.yml | 1 +
scripts/ci/extends/build.yml | 4 +++-
scripts/ci/extends/defaults.yml | 3 +++
4 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 scripts/ci/extends/defaults.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d34a2b43d85..c509bad5a0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ variables:
include:
# extends
+ - local: '/scripts/ci/extends/defaults.yml'
- local: '/scripts/ci/extends/build.yml'
- local: '/scripts/ci/extends/build-win.yml'
- local: '/scripts/ci/extends/container-maker-setup.yml'
diff --git a/scripts/ci/extends/build-win.yml b/scripts/ci/extends/build-win.yml
index 184466db307..89121eaf9fb 100644
--- a/scripts/ci/extends/build-win.yml
+++ b/scripts/ci/extends/build-win.yml
@@ -1,6 +1,7 @@
.build_win_definition:
stage: test
extends:
+ - .defaults
- .vs2019-environment
- .test-artifacts
diff --git a/scripts/ci/extends/build.yml b/scripts/ci/extends/build.yml
index e380cd329c3..151b35da2a3 100644
--- a/scripts/ci/extends/build.yml
+++ b/scripts/ci/extends/build.yml
@@ -1,6 +1,8 @@
.build_definition:
stage: test
- extends: .test-artifacts
+ extends:
+ - .defaults
+ - .test-artifacts
variables:
CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
diff --git a/scripts/ci/extends/defaults.yml b/scripts/ci/extends/defaults.yml
new file mode 100644
index 00000000000..ccfe73424d1
--- /dev/null
+++ b/scripts/ci/extends/defaults.yml
@@ -0,0 +1,3 @@
+.defaults:
+ # Disable artifacts passing between stages
+ dependencies: []
--
GitLab