diff --git a/Jenkinsfile b/Jenkinsfile index 0bf2c21..9391cd8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ -def buildTarget(String path, String rpmArch, String debArch) { - cmakeBuild buildDir: 'cmake-build-${debArch}', buildType: 'release', cleanBuild: true, installation: 'Main' - cmake arguments: '--build ./cmake-build-${debArch} --target ybcon', installation: 'Main', - cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=/usr/bin/${path}-ld.gold -DCMAKE_AR=/usr/bin/${path}-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch}' - cpack installation: 'Main', workingDir: 'cmake-build-{debArch}' +def buildTarget(path, rpmArch, String debArch) { + cmakeBuild buildDir: "cmake-build-${debArch}", buildType: 'release', cleanBuild: true, installation: 'Main' + cmake arguments: "--build ./cmake-build-${debArch} --target ybcon", installation: 'Main', + cmakeArgs: "-DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=/usr/bin/${path}-ld.gold -DCMAKE_AR=/usr/bin/${path}-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch}" + cpack installation: 'Main', workingDir: "cmake-build-{debArch}" } pipeline { // Multi-branch pipeline script for Yerbacon.