From 145a385fecc19e8d1986e5d96e82d7843f5712b5 Mon Sep 17 00:00:00 2001 From: Dany LE Date: Fri, 30 Sep 2022 11:59:35 +0200 Subject: [PATCH 1/2] Use older toolchain --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ddc03b6..efa658a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline{ stage('Build AMD64') { agent { docker { - image 'xsangle/ci-tools:latest-amd64' + image 'xsangle/ci-tools:bionic-amd64' args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http' // Run the container on the node specified at the // top-level of the Pipeline, in the same workspace, @@ -58,7 +58,7 @@ pipeline{ stage('Build ARM64') { agent { docker { - image 'xsangle/ci-tools:latest-arm64' + image 'xsangle/ci-tools:bionic-arm64' args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http' // Run the container on the node specified at the // top-level of the Pipeline, in the same workspace, @@ -77,7 +77,7 @@ pipeline{ stage('Build ARM') { agent { docker { - image 'xsangle/ci-tools:latest-arm' + image 'xsangle/ci-tools:bionic-arm' args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http' // Run the container on the node specified at the // top-level of the Pipeline, in the same workspace, From 2fc85a03fb6d0d5eea731a0c03dd0ebd877a2409 Mon Sep 17 00:00:00 2001 From: Dany LE Date: Mon, 3 Oct 2022 09:54:46 +0200 Subject: [PATCH 2/2] Update Jenkinsfile --- Jenkinsfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index efa658a..2996c0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ def build_plugin() aclocal autoconf automake --add-missing - search_path=$(realpath $WORKSPACE/../ant-http/build/$arch/usr) + search_path=$(realpath antd/build/$arch/usr) CFLAGS="-I$search_path/include" LDFLAGS="-L$search_path/lib" ./configure --prefix=/opt/www CFLAGS="-I$search_path/include" LDFLAGS="-L$search_path/lib" make DESTDIR=$WORKSPACE/build/$arch make install @@ -36,11 +36,16 @@ pipeline{ } stages { + stage('Prepare dependencies') + { + steps { + copyArtifacts(projectName: 'gitea-sync/ant-http/master', target: 'antd'); + } + } stage('Build AMD64') { agent { docker { image 'xsangle/ci-tools:bionic-amd64' - args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http' // Run the container on the node specified at the // top-level of the Pipeline, in the same workspace, // rather than on a new node entirely: @@ -59,7 +64,6 @@ pipeline{ agent { docker { image 'xsangle/ci-tools:bionic-arm64' - args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http' // Run the container on the node specified at the // top-level of the Pipeline, in the same workspace, // rather than on a new node entirely: @@ -78,7 +82,6 @@ pipeline{ agent { docker { image 'xsangle/ci-tools:bionic-arm' - args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http' // Run the container on the node specified at the // top-level of the Pipeline, in the same workspace, // rather than on a new node entirely: