From 39a0be49e2e6e5c6deb82bc1cb169c3bb441b2cf Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Tue, 8 Dec 2020 17:13:28 +0100
Subject: [PATCH] Support Submodule Branch Build for a Given BUILD_BRANCH
Issue-Ref: 4093
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1459340..0dbcfd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ clean:
when: on_success
before_script:
- git submodule update $GIT_SUBMODULE_OPTS
+ - git submodule foreach 'git pull --no-rebase origin $BUILD_BRANCH' || true
script:
- mvn $MAVEN_CLI_OPTS $MAVEN_BUILD_OPTS clean
@@ -35,6 +36,7 @@ build:
key: Default
before_script:
- git submodule update $GIT_SUBMODULE_OPTS
+ - git submodule foreach 'git pull --no-rebase origin $BUILD_BRANCH' || true
script:
- mvn $MAVEN_CLI_OPTS $MAVEN_BUILD_OPTS verify
artifacts:
@@ -51,10 +53,8 @@ test:
cache:
key: Default
before_script:
- - git submodule update $GIT_SUBMODULE_OPTS releng/org.fortiss.af3.target
- - git submodule update $GIT_SUBMODULE_OPTS tests/af3
- - git submodule update $GIT_SUBMODULE_OPTS features/af3
- - git submodule update $GIT_SUBMODULE_OPTS features/tooling
+ - git submodule update $GIT_SUBMODULE_OPTS
+ - git submodule foreach 'git pull --no-rebase origin $BUILD_BRANCH' || true
- xvfb.sh # Setup of a virtual display needed for bringing up eclipse
script:
- mvn $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $MAVEN_BUILD_DIR integration-test
--
GitLab