diff --git a/Jenkinsfile b/Jenkinsfile index 69d867d..21c7b64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,10 +37,11 @@ node { 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) { - rel_dir += "-test" + 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}" @@ -57,7 +58,7 @@ node { sh "docker system prune -f" } - archiveArtifacts 'release/*' + archiveArtifacts "${local_release_dir}/*" echo "${_msg}" } diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index 5da7a53..2dfc9af 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}android +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index 715fc66..875e581 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index fabcc20..875e581 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 0a0888e..9e9f80b 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index fabcc20..875e581 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index ed3cb66..9c23f44 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release 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 diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index d03ce70..e06ab48 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}pi +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index a513296..4f6c40d 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}windows +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index c1e07fb..c8844c4 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}windows32 +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/pip b/pip index ee137b2..f6b9131 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ee137b2820a8ca39a41031a893c904725ca21cfc +Subproject commit f6b9131f4a4e915f1ede9221ba4857333daf8199