From 4209d2f260691545488c5df2e6fe74b0cfb783e6 Mon Sep 17 00:00:00 2001 From: medcl Date: Thu, 24 Feb 2022 21:29:30 +0800 Subject: [PATCH] update jenkinsfile --- Jenkinsfile | 8 ++++---- Jenkinsfile-docker | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 94c54669..3d7138ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,10 +21,10 @@ pipeline { 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/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 stash && git pull origin master && make config build-linux' - sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-arm' - sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-darwin' - sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-win' + sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-linux' + sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-arm' + sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-darwin' + sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-win' sh "cd /home/jenkins/go/src/infini.sh/console/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \ cd /home/jenkins/go/src/infini.sh/console/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh" diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 7b7a4224..d544ecae 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -25,7 +25,7 @@ pipeline { 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/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 stash && git pull origin master && make config build && chmod a+x bin/console' + sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build && chmod a+x bin/console' sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && docker build -t infini-console -f ../docker/Dockerfile .' sh label: 'docker-tagging', script: 'docker tag infini-console infinilabs/console:latest && docker tag infini-console infinilabs/console:$VERSION-$BUILD_NUMBER'