diff --git a/Jenkinsfile b/Jenkinsfile index df09ae2..21c7b64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,10 @@ @Library('SHS.Platforms') _ -def build_docker(dist, release_dir) { +def build_docker(dist, release_dir, is_testing) { def image_name = "${dist.docker_image}-shstk" + if (is_testing) { + image_name += "-test" + } + echo "Build image ${image_name}" def args = "" for (arg in dist.docker_build_options) { @@ -9,6 +13,9 @@ def build_docker(dist, release_dir) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } + if (env.BRANCH_NAME) { + args += " --build-arg BRANCH=${env.BRANCH_NAME}" + } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" @@ -23,18 +30,25 @@ node { stage("Download SRC") { checkout scm } - + + def currentBranch = "${env.BRANCH_NAME}" + def is_testing = currentBranch.toLowerCase().contains("test") + def pl = new org.SHS.Platforms(this) pl.get() - def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' + def local_release_dir = 'release' + if (is_testing) { + local_release_dir += '-test' + } + def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist, rel_dir) + _msg += build_docker(dist, rel_dir, is_testing) }, stageSuffix: "-shstk", ondemand: true @@ -44,7 +58,7 @@ node { sh "docker system prune -f" } - archiveArtifacts 'release/*' + archiveArtifacts "${local_release_dir}/*" echo "${_msg}" } diff --git a/cd b/cd index 0c36565..b65bf5e 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 0c36565aecc0630730225d9ce55186c3117914b8 +Subproject commit b65bf5e6406108a9f53627a308419b51d41e2e4e diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index cb535f7..2dfc9af 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,6 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ FROM ${DOCKER_PREFIX}android +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH @@ -10,7 +11,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ENV NDK_PLATFORM="android-21" WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index b214846..875e581 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index b214846..875e581 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index cc83f19..9e9f80b 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index b214846..875e581 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index 4e67335..9c23f44 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,12 +1,13 @@ ARG DOCKER_PREFIX=wapmobil/ FROM ${DOCKER_PREFIX}osx +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 363b367..e06ab48 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,12 +1,13 @@ ARG DOCKER_PREFIX=wapmobil/ FROM ${DOCKER_PREFIX}pi +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index e11e48f..4f6c40d 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,12 +1,13 @@ ARG DOCKER_PREFIX=wapmobil/ FROM ${DOCKER_PREFIX}windows +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index d454355..c8844c4 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,12 +1,13 @@ ARG DOCKER_PREFIX=wapmobil/ FROM ${DOCKER_PREFIX}windows32 +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/pip b/pip index 9f1d23a..f6b9131 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9f1d23ad8ef5ee40ad21fb029e7ddb4bf59929f0 +Subproject commit f6b9131f4a4e915f1ede9221ba4857333daf8199 diff --git a/qad b/qad index f8fec93..1becca7 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f8fec93f0e99645b09c1d85dcdff47f2df1f0f68 +Subproject commit 1becca7519b0a8ab2babe8e74288d2bb9c9d72d9 diff --git a/qglengine b/qglengine index 7dfaf92..5a71585 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 7dfaf924e5c41dd69100a06c4ba35465621ea5d8 +Subproject commit 5a7158531f1b011fbcea0c16fd0dcf1f28a4bfce