SHS/shstk
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'test' (#253) from test into master

Browse Source 
Reviewed-on: #253
This commit was merged in pull request #253.
This commit is contained in:
Пелипенко Иван
2024-11-15 18:55:25 +03:00
parent 67272f9149 98c9ef3b9b
commit a0c25ea76b
11 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfile vendored
View File

@@ -37,10 +37,11 @@ node {
def pl = new org.SHS.Platforms(this) def pl = new org.SHS.Platforms(this)
pl.get() pl.get()
def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' def local_release_dir = 'release'
if (is_testing) { 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}" echo "Release to ${rel_dir}"
sh "rm -rvf ${rel_dir}" sh "rm -rvf ${rel_dir}"
sh "mkdir -p ${rel_dir}" sh "mkdir -p ${rel_dir}"
@@ -57,7 +58,7 @@ node {
sh "docker system prune -f" sh "docker system prune -f"
} }
archiveArtifacts 'release/*' archiveArtifacts "${local_release_dir}/*"
echo "${_msg}" echo "${_msg}"
} }

2
docker/android-shstk/Dockerfile
View File

@@ -1,7 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}android FROM ${DOCKER_PREFIX}android
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH

2
docker/astra1.7-shstk/Dockerfile
View File

@@ -1,8 +1,8 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
ARG IMAGE_FROM ARG IMAGE_FROM
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ARG support_gl=1 ARG support_gl=1

2
docker/astra1.8-shstk/Dockerfile
View File

@@ -1,8 +1,8 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ARG support_gl=1 ARG support_gl=1

2
docker/linux_cross-shstk/Dockerfile
View File

@@ -1,8 +1,8 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ARG support_gl=1 ARG support_gl=1

2
docker/linux_desktop-shstk/Dockerfile
View File

@@ -1,8 +1,8 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ARG support_gl=1 ARG support_gl=1

2
docker/osx-shstk/Dockerfile
View File

@@ -1,7 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}osx FROM ${DOCKER_PREFIX}osx
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH

2
docker/pi-shstk/Dockerfile
View File

@@ -1,7 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}pi FROM ${DOCKER_PREFIX}pi
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH

2
docker/windows-shstk/Dockerfile
View File

@@ -1,7 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}windows FROM ${DOCKER_PREFIX}windows
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH

2
docker/windows32-shstk/Dockerfile
View File

@@ -1,7 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}windows32 FROM ${DOCKER_PREFIX}windows32
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH

2
pip

Submodule pip updated: ee137b2820...f6b9131f4a