From b1e5c0f7ea7aa0d766b1c12201c5d158a173e9ae Mon Sep 17 00:00:00 2001 From: Username404 Date: Mon, 9 Aug 2021 18:04:13 +0200 Subject: [PATCH] Fix the previous commit... --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 142511c..0dd9acf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,9 +18,6 @@ pipeline { // Multi-branch pipeline script for Yerbacon. cmakeBuild buildDir: 'cmake-build-release', buildType: 'release', cleanBuild: true, installation: 'Main' cmakeBuild buildDir: 'cmake-build-release-arm', buildType: 'release', cleanBuild: true, installation: 'Main', cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=/usr/bin/arm-linux-gnueabi-g++ -DCMAKE_LINKER=/usr/bin/arm-linux-gnueabi-ld.gold -DCMAKE_AR=/usr/bin/arm-linux-gnueabi-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=armv4l -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=armel' - cmakeBuild buildDir: 'cmake-build-release-win32', buildType: 'release', cleanBuild: true, installation: 'Main', - cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc-posix -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-c++-posix -DCMAKE_SYSTEM_PROCESSOR=i686' - cmake arguments: '--build ./cmake-build-release --target ybcon -- -j 9', installation: 'Main' sh 'strip ./cmake-build-*/ybcon' cpack installation: 'Main', workingDir: 'cmake-build-release' cpack installation: 'Main', workingDir: 'cmake-build-release-arm' @@ -29,7 +26,8 @@ pipeline { // Multi-branch pipeline script for Yerbacon. stage('Cross-compile') { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - cmake arguments: '--build ./cmake-build-release-win32 --target ybcon -- -j 9', installation: 'Main' + cmakeBuild buildDir: 'cmake-build-release-win32', buildType: 'release', cleanBuild: true, installation: 'Main', + cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc-posix -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-c++-posix -DCMAKE_SYSTEM_PROCESSOR=i686' cpack installation: 'Main', workingDir: 'cmake-build-release-win32' dir('cmake-build-release-win32') { archiveArtifacts artifacts:'*.exe', fingerprint: false } }