From d9b5e862fa772fa2ac0b681887df155ca0fc625d Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Sun, 7 Nov 2021 23:44:42 +0100 Subject: [PATCH] Make the variables in the Jenkinsfile final --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e2b134..0a2a602 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ def buildTarget(String path, String rpmArch = 'noarch', String debArch = 'noarch', boolean isPackageArchDeb = true, String suffix = '') { - String packageArch = isPackageArchDeb ? debArch : rpmArch; + final String packageArch = isPackageArchDeb ? debArch : rpmArch; // Note: CMake 3.20 or higher is needed cmakeBuild buildDir: "cmake-build-${packageArch}${suffix}", buildType: 'release', cleanBuild: true, installation: 'Latest', cmakeArgs: "--no-warn-unused-cli -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 -DCMAKE_RC_COMPILER=/usr/bin/${path}-windres -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch} -DCXX_TARGET=${packageArch} -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS=/usr/${path}/lib/ -DNO_CCACHE=ON", @@ -9,7 +9,7 @@ def buildTarget(String path, String rpmArch = 'noarch', String debArch = 'noarch cpack installation: 'Latest', workingDir: "cmake-build-${packageArch}${suffix}" } -String windowsSuffix = '-windows' +final String windowsSuffix = '-windows' /* Required Plugins: - CMake