From 0e1ccce61a3174b980afe752ad2513df19c4f57e Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 30 Mar 2020 13:05:25 -0600 Subject: [PATCH] build: use git checkout instead of git restore The CI is using an older version of git that doesn't recognize git restore. Signed-off-by: Travis Nielsen --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f07da101a..989f7bf6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,7 +97,7 @@ pipeline { sh 'build/run make -j\$(nproc) -C build/release build BRANCH_NAME=${BRANCH_NAME} GIT_API_TOKEN=${GIT_PSW}' sh 'git status' sh 'git diff' - sh 'git restore go.sum' + sh 'git checkout -- go.sum; git checkout -- go.mod' sh 'build/run make -j\$(nproc) -C build/release publish BRANCH_NAME=${BRANCH_NAME} AWS_ACCESS_KEY_ID=${AWS_USR} AWS_SECRET_ACCESS_KEY=${AWS_PSW} GIT_API_TOKEN=${GIT_PSW}' // automatically promote the master builds sh 'build/run make -j\$(nproc) -C build/release promote BRANCH_NAME=master CHANNEL=master AWS_ACCESS_KEY_ID=${AWS_USR} AWS_SECRET_ACCESS_KEY=${AWS_PSW}' @@ -156,7 +156,7 @@ pipeline { sh 'build/run make -j\$(nproc) -C build/release build BRANCH_NAME=${BRANCH_NAME} TAG_WITH_SUFFIX=true GIT_API_TOKEN=${GIT_PSW}' sh 'git status' sh 'git diff' - sh 'git restore go.sum' + sh 'git checkout -- go.sum; git checkout -- go.mod' sh 'build/run make -j\$(nproc) -C build/release publish BRANCH_NAME=${BRANCH_NAME} TAG_WITH_SUFFIX=true AWS_ACCESS_KEY_ID=${AWS_USR} AWS_SECRET_ACCESS_KEY=${AWS_PSW} GIT_API_TOKEN=${GIT_PSW}' } }