From 7a0fb883f4c71733cc481468537c4b41b1fa5e36 Mon Sep 17 00:00:00 2001 From: medcl Date: Tue, 23 Nov 2021 13:58:45 +0800 Subject: [PATCH] update build file --- Jenkinsfile | 7 ++++++- Makefile | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0555cfe1..ea315444 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ - sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean config build-linux build-arm' + sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean config build-linux build-arm build-darwin build-win' sh "cd /home/jenkins/go/src/infini.sh/search-center/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \ cd /home/jenkins/go/src/infini.sh/search-center/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh" sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install' @@ -34,6 +34,11 @@ pipeline { sh label: 'package-linux-arm6', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm6.tar.gz console-linux-armv6 console.yml ' sh label: 'package-linux-arm7', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm7.tar.gz console-linux-armv7 console.yml ' sh label: 'package-linux-arm64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm64.tar.gz console-linux-arm64 console.yml ' + + sh label: 'package-mac-amd64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-mac-amd64.zip console-mac-amd64 console.yml ' + sh label: 'package-mac-arm64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-mac-arm64.zip console-mac-arm64 console.yml ' + sh label: 'package-win-amd64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-windows-amd64.zip console-windows-amd64 console.yml ' + sh label: 'package-win-386', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-windows-386.zip console-windows-386 console.yml ' archiveArtifacts artifacts: 'console-$VERSION-$BUILD_NUMBER-*.tar.gz', fingerprint: true, followSymlinks: true, onlyIfSuccessful: false } } diff --git a/Makefile b/Makefile index 75b9da43..d0fa59d9 100755 --- a/Makefile +++ b/Makefile @@ -213,9 +213,9 @@ package-all-platform: package-darwin-platform package-linux-platform package-win package-darwin-platform: @echo "Packaging Darwin" - cd $(OUTPUT_DIR) && tar cfz $(OUTPUT_DIR)/mac-amd64.tar.gz $(APP_NAME)-mac-amd64 $(APP_CONFIG) -# cd $(OUTPUT_DIR) && tar cfz $(OUTPUT_DIR)/mac-386.tar.gz $(APP_NAME)-mac-386 $(APP_CONFIG) -# cd $(OUTPUT_DIR) && tar cfz $(OUTPUT_DIR)/mac-arm64.tar.gz $(APP_NAME)-mac-arm64 $(APP_CONFIG) + cd $(OUTPUT_DIR) && zip -r $(OUTPUT_DIR)/mac-amd64.zip $(APP_NAME)-mac-amd64 $(APP_CONFIG) +# cd $(OUTPUT_DIR) && zip -r $(OUTPUT_DIR)/mac-386.zip $(APP_NAME)-mac-386 $(APP_CONFIG) + cd $(OUTPUT_DIR) && zip -r $(OUTPUT_DIR)/mac-arm64.zip $(APP_NAME)-mac-arm64 $(APP_CONFIG) package-linux-platform: @echo "Packaging Linux" @@ -235,8 +235,8 @@ package-linux-arm-platform: package-windows-platform: @echo "Packaging Windows" - cd $(OUTPUT_DIR) && tar cfz $(OUTPUT_DIR)/windows-amd64.tar.gz $(APP_NAME)-windows-amd64.exe $(APP_CONFIG) - cd $(OUTPUT_DIR) && tar cfz $(OUTPUT_DIR)/windows-386.tar.gz $(APP_NAME)-windows-386.exe $(APP_CONFIG) + cd $(OUTPUT_DIR) && zip -r $(OUTPUT_DIR)/windows-amd64.zip $(APP_NAME)-windows-amd64.exe $(APP_CONFIG) + cd $(OUTPUT_DIR) && zip -r $(OUTPUT_DIR)/windows-386.zip $(APP_NAME)-windows-386.exe $(APP_CONFIG) test: go get -u github.com/kardianos/govendor