From 41d16d6ebd8da839b6370fe3bcf85d35128fc271 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Thu, 18 Oct 2018 07:46:16 +0100 Subject: [PATCH] adding git pull --rebase to build.sh unixBuild --- contrib/buildserver/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/buildserver/build.sh b/contrib/buildserver/build.sh index 0ad023b5..bcb6589a 100755 --- a/contrib/buildserver/build.sh +++ b/contrib/buildserver/build.sh @@ -38,8 +38,10 @@ cd ${cd} mkdir -p buildserver rm -rf buildserver git clone --branch $branch https://github.com/exiv2/exiv2 buildserver -mkdir -p buildserver/build -cd buildserver/build +cd buildserver +git pull --rebase +mkdir -p build +cd build cmake .. -G "Unix Makefiles" make make tests