From 1f393ac842d7b4ceb124fdfacb36e496532a4c26 Mon Sep 17 00:00:00 2001 From: medcl Date: Wed, 30 Mar 2022 12:15:22 +0800 Subject: [PATCH] update jenkins file --- Jenkinsfile | 4 +++- Jenkinsfile-docker | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fc2ef3e0..30824820 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,9 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| rm -rif web' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true || git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git pull origin master' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git stash' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-linux' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 97c2744e..54293423 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -21,9 +21,10 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| mv web /dev/null' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| rm -rif web' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true || git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git pull origin master' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git stash' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build && chmod a+x bin/console'