diff --git a/Jenkinsfile-linux b/Jenkinsfile-linux index fbb68fc1..118dd4e8 100644 --- a/Jenkinsfile-linux +++ b/Jenkinsfile-linux @@ -29,13 +29,11 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-linux-amd64' sh label: 'copy-license', script: 'cd /home/jenkins/go/src/infini.sh/console && cp ../framework/LICENSE bin && cat ../framework/NOTICE NOTICE > bin/NOTICE' sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.tpl bin/config' - sh label: 'copy-certs', script: 'cd /home/jenkins/go/src/infini.sh/console && cp -rf config/certs bin/config' sh label: 'package-linux-amd64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-amd64.tar.gz console-linux-amd64 console.yml LICENSE NOTICE config' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-arm' sh label: 'copy-license', script: 'cd /home/jenkins/go/src/infini.sh/console && cp ../framework/LICENSE bin && cat ../framework/NOTICE NOTICE > bin/NOTICE' sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.tpl bin/config' - sh label: 'copy-certs', script: 'cd /home/jenkins/go/src/infini.sh/console && cp -rf config/certs bin/config' sh label: 'package-linux-arm64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm64.tar.gz console-linux-arm64 console.yml LICENSE NOTICE config' archiveArtifacts artifacts: 'console-$VERSION-$BUILD_NUMBER-*.*', fingerprint: true, followSymlinks: true, onlyIfSuccessful: false diff --git a/Jenkinsfile-linux-amd64 b/Jenkinsfile-linux-amd64 index 87b062a0..3bfa2de7 100644 --- a/Jenkinsfile-linux-amd64 +++ b/Jenkinsfile-linux-amd64 @@ -28,7 +28,6 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-linux-amd64' sh label: 'copy-license', script: 'cd /home/jenkins/go/src/infini.sh/console && cp ../framework/LICENSE bin && cat ../framework/NOTICE NOTICE > bin/NOTICE' sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.tpl bin/config' - sh label: 'copy-certs', script: 'cd /home/jenkins/go/src/infini.sh/console && cp -rf config/certs bin/config' sh label: 'package-linux-amd64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-amd64.tar.gz console-linux-amd64 console.yml LICENSE NOTICE config' archiveArtifacts artifacts: 'console-$VERSION-$BUILD_NUMBER-*.*', fingerprint: true, followSymlinks: true, onlyIfSuccessful: false diff --git a/build.bat b/build.bat deleted file mode 100644 index 4afa084b..00000000 --- a/build.bat +++ /dev/null @@ -1,2 +0,0 @@ -set GOPATH=%CD%;%CD%/vendor;%GOPATH% -go build -w -s diff --git a/build.sh b/build.sh index 8b9fd5c4..38f8dcaa 100644 --- a/build.sh +++ b/build.sh @@ -33,7 +33,6 @@ cp -rf $WORKBASE/framework/LICENSE $WORKDIR/bin && cat $WORKBASE/framework/NOTIC mkdir -p $WORKDIR/bin/config cp $WORKDIR/config/*.json $WORKDIR/bin/config cp -rf $WORKDIR/config/*.tpl $WORKDIR/bin/config -cp -rf $WORKDIR/config/certs $WORKDIR/bin/config cd $WORKDIR/bin #编译出错后,根据文件是否存在判断是否进行下一步骤 @@ -63,7 +62,6 @@ WORKDIR / COPY ["$PNAME-linux-$t", "$PNAME.yml", "\${APP_HOME}/"] COPY ["config", "\${APP_HOME}/config"] -COPY ["config/certs", "\${APP_HOME}/config/certs"] CMD ["/${PNAME}-linux-$t"] EOF