From b07105e4322871cb5a615c270c0741912f7f8f72 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 25 May 2021 18:27:23 +0000
Subject: [PATCH] Merge branch 'feature/ci-test-lecture-master' into 'master'
[ci] test master branch in lecture
See merge request dumux-repositories/dumux!2639
(cherry picked from commit 362b136ce69931a23b3217922a92e02d1287fa06)
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2645944573..ba50256890 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,8 +80,7 @@ trigger lecture:
stage: downstream modules
trigger:
project: dumux-repositories/dumux-lecture
- # TODO: use master when lecture pipeline is set up
- branch: feature/test-dumux-trigger
+ branch: master
strategy: depend
variables:
DUMUX_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
--
GitLab