aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Poussin <fabien.poussin@gmail.com>2019-03-11 22:22:14 +0100
committerFabien Poussin <fabien.poussin@gmail.com>2019-03-11 22:22:14 +0100
commitb9872ff13d009e8ea949701e6a496740f1022367 (patch)
treee8a21d19de6354bfb88e88093c32cd0f970607a8
parentc66b54376b57d00bc38be196f7db906980154983 (diff)
downloadChibiOS-Contrib-b9872ff13d009e8ea949701e6a496740f1022367.tar.gz
ChibiOS-Contrib-b9872ff13d009e8ea949701e6a496740f1022367.tar.bz2
ChibiOS-Contrib-b9872ff13d009e8ea949701e6a496740f1022367.zip
Another jenkins fix
-rw-r--r--Jenkinsfile16
1 files 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