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}"
 }
 

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 

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

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

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

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

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 

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 

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 

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