diff --git a/src/org/SHS/SDK.groovy b/src/org/SHS/SDK.groovy index 99e3529..3ad1b94 100644 --- a/src/org/SHS/SDK.groovy +++ b/src/org/SHS/SDK.groovy @@ -24,28 +24,38 @@ class SDK { def taglist = steps.sh(script: "cd \"${steps.env.SHSSDK_DIR}\" && ls -1d */", returnStdout: true).trim().split('\n') for (dir in taglist) { if (!dir.startsWith('v') || !dir.endsWith('/')) continue + //try { - def tag = dir.trim() - tag = tag.substring(0, tag.length() - 1) - steps.print("Building for \"${tag}\"") - pl._root = steps.readJSON(file: "${steps.env.SHSSDK_DIR}/${tag}/platforms.json") - pl.forEach ({ dist, cmake_toolchain -> - //steps.print("compile in ${dist.docker_image} with arg ${cmake_toolchain}") - steps.docker.image("${dist.docker_image}-shs-${tag}").inside() { - steps.sh "mkdir -p build" - steps.sh "cd build && cmake -G Ninja ${cmake_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 release build || true" - } - }, - // //whiteList: ["ubuntu", "debian", "osx"], - blackList: ["android"] - ) //} catch (Exception e) { // steps.println "Error: ${e.getMessage()}" //} finally { //} + + def tag = dir.trim() + tag = tag.substring(0, tag.length() - 1) + steps.print("Building for \"${tag}\"") + steps.sh "rm -rf release || true" + steps.sh "mkdir -p release/${tag}" + pl._root = steps.readJSON(file: "${steps.env.SHSSDK_DIR}/${tag}/platforms.json") + pl.forEach ({ dist, cmake_toolchain -> + //steps.print("compile in ${dist.docker_image} with arg ${cmake_toolchain}") + steps.docker.image("${dist.docker_image}-shs-${tag}").inside() { + steps.sh "mkdir -p build" + steps.sh "cd build && cmake -G Ninja ${cmake_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 || true" + } + }, + //whiteList: ["ubuntu", "debian", "osx"], + blackList: ["android"] + ) + + steps.stage("Copy plugins") { + def plugins_dir = "${steps.env.SHSSDK_DIR}/${tag}/plugins" + steps.sh "cp -rvf release/${tag}/* ${plugins_dir}/" + } + } steps.stage("Register for autobuild") {