From b9872ff13d009e8ea949701e6a496740f1022367 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Mon, 11 Mar 2019 22:22:14 +0100 Subject: Another jenkins fix --- Jenkinsfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86c9437..6ed3b22 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,8 +32,8 @@ rm -rf $CH_PATH git clone /var/lib/git/ChibiOS $CH_PATH cd $CH_PATH git remote set-url origin https://github.com/ChibiOS/ChibiOS.git -git pull --rebase -git checkout -b $CH_BRANCH +git fetch --all +git checkout -b $CH_BRANCH origin/$CH_BRANCH git pull --rebase origin $CH_BRANCH cd ext @@ -59,8 +59,8 @@ rm -rf $CH_PATH git clone /var/lib/git/ChibiOS $CH_PATH cd $CH_PATH git remote set-url origin https://github.com/ChibiOS/ChibiOS.git -git pull --rebase -git checkout -b $CH_BRANCH +git fetch --all +git checkout -b $CH_BRANCH origin/$CH_BRANCH git pull --rebase origin $CH_BRANCH cd ext @@ -87,8 +87,8 @@ rm -rf $CH_PATH git clone /var/lib/git/ChibiOS $CH_PATH cd $CH_PATH git remote set-url origin https://github.com/ChibiOS/ChibiOS.git -git pull --rebase -git checkout -b $CH_BRANCH +git fetch --all +git checkout -b $CH_BRANCH origin/$CH_BRANCH git pull --rebase origin $CH_BRANCH cd ext @@ -115,8 +115,8 @@ rm -rf $CH_PATH git clone /var/lib/git/ChibiOS $CH_PATH cd $CH_PATH git remote set-url origin https://github.com/ChibiOS/ChibiOS.git -git pull --rebase -git checkout -b $CH_BRANCH +git fetch --all +git checkout -b $CH_BRANCH origin/$CH_BRANCH git pull --rebase origin $CH_BRANCH cd ext -- cgit v1.2.3