Skip to content
Snippets Groups Projects
Commit 776e5c96 authored by Johannes Junggeburth's avatar Johannes Junggeburth :dog2:
Browse files

Merge branch 'PipelineFix' into 'main'

Pipeline fix

See merge request !313
parents a5674ddf 05d70b04
No related branches found
No related tags found
1 merge request!313Pipeline fix
Pipeline #7268761 passed
......@@ -103,14 +103,18 @@ heading "Rebase the GeoModel code base w.r.t. main"
cd ${CI_PROJECT_DIR}
git fetch origin
fill_line "Changes w.r.t to main before rebase"
export
git diff HEAD origin/main
git rebase origin/main
fill_line "Changes w.r.t to main after rebase"
if [ "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" == "main" ];then
fill_line "Changes w.r.t to main before rebase"
git fetch origin
git diff HEAD origin/main
git rebase origin/main
fill_line "Changes w.r.t to main after rebase"
git diff HEAD origin/main
git diff HEAD origin/main
fi
cd ${BUILD_DIR}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment