From 6b3ea7d6f5a62da5d99f60bc1ed1891373e19e78 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 19 Nov 2023 22:30:22 +0300 Subject: [PATCH] 2 --- src/org/SHS/SDK.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/SHS/SDK.groovy b/src/org/SHS/SDK.groovy index 1675b1b..c2d0956 100644 --- a/src/org/SHS/SDK.groovy +++ b/src/org/SHS/SDK.groovy @@ -31,8 +31,8 @@ class SDK { steps.docker.image("${dist.docker_image}-shs-${tag}").inside() { steps.sh "mkdir -p build" steps.sh "rm -rf release/* build/* || true" - steps.sh "cd build && cmake -G Ninja ${toolchain} -DCMAKE_PREFIX_PATH=/soft/SHS/sdk -DBUILD_NUMBER=${env.BUILD_NUMBER} -DCMAKE_INSTALL_PREFIX=`pwd`/../release/${tag} ../" - steps.sh "cd build && cmake --build ./ --target install -j${env.JOBS_COUNT}" + steps.sh "cd build && cmake -G Ninja ${toolchain} -DCMAKE_PREFIX_PATH=/soft/SHS/sdk -DBUILD_NUMBER=${steps.env.BUILD_NUMBER} -DCMAKE_INSTALL_PREFIX=`pwd`/../release/${tag} ../" + steps.sh "cd build && cmake --build ./ --target install -j${steps.env.JOBS_COUNT}" steps.archiveArtifacts 'release/${tag}/*' // steps.sh 'rm -rf ./build ./bin ./release ./builds' } @@ -46,11 +46,11 @@ class SDK { } steps.stage("Register for autobuild") { - def plugin_jobs_dir = "${env.SHSSDK_DIR}/plugin_jobs" - def checksum = steps.sh(script: "echo \"${env.JOB_NAME}\" | sha1sum -", returnStdout: true).trim().substring(0, 40) + def plugin_jobs_dir = "${steps.env.SHSSDK_DIR}/plugin_jobs" + def checksum = steps.sh(script: "echo \"${steps.env.JOB_NAME}\" | sha1sum -", returnStdout: true).trim().substring(0, 40) def filename = checksum + ".name" steps.sh "mkdir -p ${plugin_jobs_dir} || true" - steps.sh "echo \"${env.JOB_NAME}\" > ${plugin_jobs_dir}/${filename}" + steps.sh "echo \"${steps.env.JOB_NAME}\" > ${plugin_jobs_dir}/${filename}" } }