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

Merge pull request 'master' (#254) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #254
This commit was merged in pull request #254.
This commit is contained in:
Пелипенко Иван
2024-11-15 19:00:52 +03:00
parent 6daaa85271 a0c25ea76b
commit 142ab4504e
14 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Jenkinsfile vendored
View File

@@ -1,6 +1,10 @@
@Library('SHS.Platforms') _ @Library('SHS.Platforms') _
def build_docker(dist, release_dir) { def build_docker(dist, release_dir, is_testing) {
def image_name = "${dist.docker_image}-shstk" def image_name = "${dist.docker_image}-shstk"
if (is_testing) {
image_name += "-test"
}
echo "Build image ${image_name}" echo "Build image ${image_name}"
def args = "" def args = ""
for (arg in dist.docker_build_options) { for (arg in dist.docker_build_options) {
@@ -9,6 +13,9 @@ def build_docker(dist, release_dir) {
if (env.DOCKER_PREFIX) { if (env.DOCKER_PREFIX) {
args += " --build-arg DOCKER_PREFIX=${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 IMAGE_FROM=${dist.docker_image}"
args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}"
@@ -23,18 +30,25 @@ node {
stage("Download SRC") { stage("Download SRC") {
checkout scm checkout scm
} }
def currentBranch = "${env.BRANCH_NAME}"
def is_testing = currentBranch.toLowerCase().contains("test")
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) {
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}"
def _msg = "Built images:" def _msg = "Built images:"
pl.forEach ({ dist -> pl.forEach ({ dist ->
_msg += build_docker(dist, rel_dir) _msg += build_docker(dist, rel_dir, is_testing)
}, },
stageSuffix: "-shstk", stageSuffix: "-shstk",
ondemand: true ondemand: true
@@ -44,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
cd

Submodule cd updated: 0c36565aec...b65bf5e640

3
docker/android-shstk/Dockerfile
View File

@@ -1,6 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
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
@@ -10,7 +11,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake
ENV NDK_PLATFORM="android-21" ENV NDK_PLATFORM="android-21"
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

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

@@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/
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
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 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 \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

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

@@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/
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
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 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 \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/linux_cross-shstk/Dockerfile
View File

@@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/
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
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/linux_desktop-shstk/Dockerfile
View File

@@ -2,13 +2,14 @@ ARG DOCKER_PREFIX=wapmobil/
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
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 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 \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/osx-shstk/Dockerfile
View File

@@ -1,12 +1,13 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
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
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/pi-shstk/Dockerfile
View File

@@ -1,12 +1,13 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
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
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/windows-shstk/Dockerfile
View File

@@ -1,12 +1,13 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
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
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/windows32-shstk/Dockerfile
View File

@@ -1,12 +1,13 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
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
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

2
pip

Submodule pip updated: 9f1d23ad8e...f6b9131f4a

2
qad

Submodule qad updated: f8fec93f0e...1becca7519

2
qglengine

Submodule qglengine updated: 7dfaf924e5...5a7158531f