Add a note about the CMake 3.20+ requirement in the Jenkinsfile and set the used cmake installation to "Latest"
This commit is contained in:
		
							parent
							
								
									ab7fcee9a2
								
							
						
					
					
						commit
						24d73a3f82
					
				
							
								
								
									
										11
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							@ -1,10 +1,11 @@
 | 
			
		||||
def buildTarget(String path, String rpmArch, String debArch, boolean isPackageArchDeb = true) {
 | 
			
		||||
    String packageArch = isPackageArchDeb ? debArch : rpmArch;
 | 
			
		||||
    cmakeBuild buildDir: "cmake-build-${packageArch}", buildType: 'release', cleanBuild: true, installation: 'Main',
 | 
			
		||||
    // Note: CMake 3.20 or higher is needed
 | 
			
		||||
    cmakeBuild buildDir: "cmake-build-${packageArch}", buildType: 'release', cleanBuild: true, installation: 'Latest',
 | 
			
		||||
        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} -DCXX_TARGET=${packageArch} -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS=/usr/${path}/lib/"
 | 
			
		||||
    cmake arguments: "--build ./cmake-build-${packageArch} --target ybcon", installation: 'Main'
 | 
			
		||||
    cmake arguments: "--build ./cmake-build-${packageArch} --target ybcon", installation: 'Latest'
 | 
			
		||||
    sh "/usr/bin/${path}-strip ./cmake-build-${packageArch}/ybcon"
 | 
			
		||||
    cpack installation: 'Main', workingDir: "cmake-build-${packageArch}"
 | 
			
		||||
    cpack installation: 'Latest', workingDir: "cmake-build-${packageArch}"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pipeline { // Multi-branch pipeline script for Yerbacon.
 | 
			
		||||
@ -34,9 +35,9 @@ pipeline { // Multi-branch pipeline script for Yerbacon.
 | 
			
		||||
        stage('Build for other platforms') {
 | 
			
		||||
            steps {
 | 
			
		||||
                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
 | 
			
		||||
                    cmakeBuild buildDir: 'cmake-build-release-win32', buildType: 'release', cleanBuild: true, installation: 'Main',
 | 
			
		||||
                    cmakeBuild buildDir: 'cmake-build-release-win32', buildType: 'release', cleanBuild: true, installation: 'Latest',
 | 
			
		||||
                        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'
 | 
			
		||||
                    cpack installation: 'Latest', workingDir: 'cmake-build-release-win32'
 | 
			
		||||
                    dir('cmake-build-release-win32') { archiveArtifacts artifacts:'*.exe', fingerprint: false }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user