diff --git a/Jenkinsfile b/Jenkinsfile index 3b6404e..9fb72e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,50 +1,5 @@ -def remote = [:] -remote.name = 'workstation' -remote.host = 'workstation' -remote.user = 'dany' -remote.identityFile = '/var/jenkins_home/.ssh/id_rsa' -remote.allowAnyHosts = true -remote.agent = false -remote.logLevel = 'INFO' -def copylib() -{ - sh ''' - set -e - set -x - cd $WORKSPACE - mkdir lib-$arch - W=lib-$arch - cp -rf /lib/*-linux-*/libsqlite3*.so* $W - cp -rf /lib/*-linux-*/libreadline*.so* $W - cp -rf /lib/*-linux-*/libncurse*.so* $W - cp -rf /lib/*-linux-*/libz*.so* $W - cp -rf /lib/*-linux-*/libcrypt*.so* $W - cp -rf /lib/*-linux-*/libdl*.so* $W - cp -rf /lib/*-linux-*/libm*.so* $W - cp -rf /lib/*-linux-*/libpthread*.so* $W - cp -rf /lib/*-linux-*/libssl*.so* $W - cp -rf /lib/*-linux-*/libc.so* $W - cp -rf /lib/*-linux-*/libgcc*.so* $W - cp -rf /lib/*-linux-*/ld*.so* $W - cp -rf /lib/*-linux-*/libjpeg*.so* $W - cp -rf /lib/*-linux-*/libvncclient*.so* $W - # vnc client support - cp -rf /lib/*-linux-*/libgcrypt*.so* $W - cp -rf /lib/*-linux-*/libsasl2*.so* $W - cp -rf /lib/*-linux-*/liblzo2*.so* $W - cp -rf /lib/*-linux-*/libgnutls*.so* $W - cp -rf /lib/*-linux-*/libgpg-error*.so* $W - cp -rf /lib/*-linux-*/libp11-kit*.so* $W - cp -rf /lib/*-linux-*/libtasn1*.so* $W - cp -rf /lib/*-linux-*/libnettle*.so* $W - cp -rf /lib/*-linux-*/libhogweed*.so* $W - cp -rf /lib/*-linux-*/libgmp*.so* $W - cp -rf /lib/*-linux-*/libffi*.so* $W - ''' -} - pipeline{ - agent { node{ label'master' }} + agent { node{ label'workstation' }} options { // Limit build history with buildDiscarder option: // daysToKeepStr: history is only kept up to this many days. @@ -63,55 +18,26 @@ pipeline{ } stages { - stage('Prepare AMD64') { - agent { - docker { - image 'xsangle/ci-tools:latest-amd64' - //args '-v /var/jenkins_home/workspace/antos-appimage:/var/jenkins_home/workspace/antos-appimage' - reuseNode true - } - } + stage('Prepare binaries') { steps { - script{ - env.arch = "amd64" - } - copylib() - } - } - stage('Prepare ARM64') { - agent { - docker { - image 'xsangle/ci-tools:latest-arm64' - //args '-v /var/jenkins_home/workspace/antos-appimage:/var/jenkins_home/workspace/antos-appimage' - reuseNode true - } - } - steps { - script{ - env.arch = "arm64" - } - copylib() - } - } - stage('Prepare ARM') { - agent { - docker { - image 'xsangle/ci-tools:latest-arm' - //args '-v /var/jenkins_home/workspace/antos-appimage:/var/jenkins_home/workspace/antos-appimage' - reuseNode true - } - } - steps { - script{ - env.arch = "arm" - } - copylib() + sh''' + [ -d build ] && rm -rf build + mkdir -p build/frontend + mkdir -p build/backend + ''' + copyArtifacts(projectName: 'gitea-sync/ant-http/master', target: 'build/backend'); + copyArtifacts(projectName: 'gitea-sync/antd-lua-plugin/master', target: 'build/backend'); + copyArtifacts(projectName: 'gitea-sync/antd-tunnel-plugin/master', target: 'build/backend'); + copyArtifacts(projectName: 'gitea-sync/antd-wvnc-plugin/master', target: 'build/backend'); + copyArtifacts(projectName: 'gitea-sync/antd-tunnel-publishers/master', target: 'build/backend'); + copyArtifacts(projectName: 'luasocket', target: 'build/backend'); + copyArtifacts(projectName: 'luasec', target: 'build/backend'); + copyArtifacts(projectName: 'gitea-sync/gitea-sync/antd-web-apps/master/master', target: 'build/backend'); } } stage('Build AMD64') { steps { - sshCommand remote: remote, command: ''' - export WORKSPACE=/var/jenkins_home/workspace/antos-appimage + sh''' cd $WORKSPACE [ -d build ] || mkdir build for file in /var/jenkins_home/workspace/nightly-antosaio/build/frontend/*; do @@ -123,8 +49,7 @@ pipeline{ } stage('Build arm64') { steps { - sshCommand remote: remote, command: ''' - export WORKSPACE=/var/jenkins_home/workspace/antos-appimage + sh''' cd $WORKSPACE [ -d build ] || mkdir build for file in /var/jenkins_home/workspace/nightly-antosaio/build/frontend/*; do @@ -136,8 +61,7 @@ pipeline{ } stage('Build arm') { steps { - sshCommand remote: remote, command: ''' - export WORKSPACE=/var/jenkins_home/workspace/antos-appimage + sh''' cd $WORKSPACE [ -d build ] || mkdir build for file in /var/jenkins_home/workspace/nightly-antosaio/build/frontend/*; do