Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux-lecture
Commits
0864878e
Commit
0864878e
authored
Aug 15, 2021
by
Timo Koch
Browse files
Merge branch 'fix/ci-upstream-branch' into 'master'
[ci] check out source branch in upstream mrs See merge request
!162
parents
0a66d0ca
683ac39e
Pipeline
#7548
passed with stage
Changes
1
Pipelines
22
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci/default.yml
View file @
0864878e
...
@@ -24,20 +24,19 @@ select tests:
...
@@ -24,20 +24,19 @@ select tests:
stage
:
configure
stage
:
configure
before_script
:
before_script
:
-
|
-
|
if [ ! -d "$DUMUX_FOLDER" ]; then
git clone -b master --depth 1 $DUMUX_REPO $DUMUX_FOLDER
fi
if [[ -n "$DUMUX_MR_SOURCE_BRANCH" ]]; then
if [[ -n "$DUMUX_MR_SOURCE_BRANCH" ]]; then
echo "Fetching upstream branches related to merge request."
echo "Fetching upstream branches related to merge request."
echo "Source branch: $DUMUX_MR_SOURCE_BRANCH"
echo "Source branch: $DUMUX_MR_SOURCE_BRANCH"
echo "Target branch: $DUMUX_MR_TARGET_BRANCH"
echo "Target branch: $DUMUX_MR_TARGET_BRANCH"
git clone -b ${DUMUX_MR_SOURCE_BRANCH} --depth 1 $DUMUX_REPO $DUMUX_FOLDER
pushd $DUMUX_FOLDER
pushd $DUMUX_FOLDER
git fetch --depth=1 origin ${DUMUX_MR_TARGET_BRANCH}:${DUMUX_MR_TARGET_BRANCH}
git fetch --depth=1 origin ${DUMUX_MR_TARGET_BRANCH}:${DUMUX_MR_TARGET_BRANCH}
popd
popd
else
else
git clone -b master --depth 1 $DUMUX_REPO $DUMUX_FOLDER
pushd $DUMUX_FOLDER
pushd $DUMUX_FOLDER
if [[ -n "$DUMUX_TRIGGER_COMMIT_SHA" ]]; then
if [[ -n "$DUMUX_TRIGGER_COMMIT_SHA" ]]; then
echo "Fetching upstream commit $DUMUX_TRIGGER_COMMIT_SHA"
echo "Fetching upstream commit $DUMUX_TRIGGER_COMMIT_SHA"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment