OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "changed: manually merge pr's to work around slow updating merge refs on github"

Browse Source 
This reverts commit b338e56730.

Causes too much problems to be worth the gains
This commit is contained in:
Arne Morten Kvarving 2018-05-29 09:20:45 +02:00
parent 61b7977406
commit 47d06c526f
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jenkins/build-opm-module.sh
View File

@ -12,7 +12,7 @@ function parseRevisions {
do
if grep -qi "$upstream=" <<< $ghprbCommentBody
then
upstreamRev[$upstream]=pull/`echo $ghprbCommentBody | sed -r "s/.*${upstream,,}=([0-9]+).*/\1/g"`/head
upstreamRev[$upstream]=pull/`echo $ghprbCommentBody | sed -r "s/.*${upstream,,}=([0-9]+).*/\1/g"`/merge
fi
done
if grep -q "with downstreams" <<< $ghprbCommentBody
@ -21,7 +21,7 @@ function parseRevisions {
do
if grep -qi "$downstream=" <<< $ghprbCommentBody
then
downstreamRev[$downstream]=pull/`echo $ghprbCommentBody | sed -r "s/.*${downstream,,}=([0-9]+).*/\1/g"`/head
downstreamRev[$downstream]=pull/`echo $ghprbCommentBody | sed -r "s/.*${downstream,,}=([0-9]+).*/\1/g"`/merge
fi
done
fi
@ -130,18 +130,8 @@ function clone_module {
else
git remote add origin https://github.com/OPM/$1
fi
# Complication due to github slow merge ref updates
if [ "$2" == "master" ]
then
git fetch --depth 1 origin $2:branch_to_build
git checkout branch_to_build
else
git fetch --depth 1 origin master
git fetch --depth 1 origin $2:branch_to_build
git checkout master
git merge branch_to_build
test $? -eq 0 || exit 1
fi
git fetch --depth 1 origin $2:branch_to_build
git checkout branch_to_build
git log HEAD -1 | cat
test $? -eq 0 || exit 1
popd