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

test debug builds

Browse Source
This commit is contained in:
Пелипенко Иван
2024-12-03 11:26:14 +03:00
parent 72c82b787c
commit 549b9864e0
12 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Jenkinsfile vendored
View File

@@ -1,9 +1,14 @@
@Library('SHS.Platforms') _ @Library('SHS.Platforms') _
def build_docker(dist, release_dir, is_testing) { def build_docker(dist, release_dir, is_testing, is_debug) {
def image_from = "${dist.docker_image}"
def image_name = "${dist.docker_image}-shstk" def image_name = "${dist.docker_image}-shstk"
if (is_testing) { if (is_testing) {
image_name += "-test" image_name += "-test"
} }
if (is_debug) {
image_from += "-debug"
image_name += "-debug"
}
echo "Build image ${image_name}" echo "Build image ${image_name}"
def args = "" def args = ""
@@ -18,7 +23,7 @@ def build_docker(dist, release_dir, is_testing) {
args += " --build-arg BRANCH=${env.BRANCH_NAME}" args += " --build-arg BRANCH=${env.BRANCH_NAME}"
} }
} }
args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg IMAGE_FROM=${image_from}"
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}"
def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}") def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}")
@@ -27,7 +32,11 @@ def build_docker(dist, release_dir, is_testing) {
} }
return "\n - ${image_name}" return "\n - ${image_name}"
} }
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], copyArtifactPermission('*')]); properties([
[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']],
[booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version')],
copyArtifactPermission('*')
]);
node { node {
stage("Download SRC") { stage("Download SRC") {
checkout scm checkout scm
@@ -35,6 +44,7 @@ node {
def currentBranch = "${env.BRANCH_NAME}" def currentBranch = "${env.BRANCH_NAME}"
def is_testing = currentBranch.toLowerCase().contains("test") def is_testing = currentBranch.toLowerCase().contains("test")
def is_debug = Boolean.valueOf(Debug))
def pl = new org.SHS.Platforms(this) def pl = new org.SHS.Platforms(this)
pl.get() pl.get()
@@ -43,6 +53,7 @@ node {
if (is_testing) { if (is_testing) {
local_release_dir += '-test' local_release_dir += '-test'
} }
def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir 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}"
@@ -50,7 +61,7 @@ node {
def _msg = "Built images:" def _msg = "Built images:"
pl.forEach ({ dist -> pl.forEach ({ dist ->
_msg += build_docker(dist, rel_dir, is_testing) _msg += build_docker(dist, rel_dir, is_testing, is_debug)
}, },
stageSuffix: "-shstk", stageSuffix: "-shstk",
ondemand: true ondemand: true

2
cmake

Submodule cmake updated: 7d53e93799...0d3b2ded8e

8
docker/android-shstk/Dockerfile
View File

@@ -23,22 +23,22 @@ WORKDIR /soft/shstk_build_anroid
ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake
ENV _CUR_ABI=armeabi-v7a ENV _CUR_ABI=armeabi-v7a
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
ENV _CUR_ABI=arm64-v8a ENV _CUR_ABI=arm64-v8a
WORKDIR /soft/shstk_build_android_${_CUR_ABI} WORKDIR /soft/shstk_build_android_${_CUR_ABI}
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
ENV _CUR_ABI=x86 ENV _CUR_ABI=x86
WORKDIR /soft/shstk_build_android_${_CUR_ABI} WORKDIR /soft/shstk_build_android_${_CUR_ABI}
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
ENV _CUR_ABI=x86_64 ENV _CUR_ABI=x86_64
WORKDIR /soft/shstk_build_android_${_CUR_ABI} WORKDIR /soft/shstk_build_android_${_CUR_ABI}
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf * && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
RUN mkdir -p /soft/shstk/release RUN mkdir -p /soft/shstk/release

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

@@ -12,7 +12,7 @@ WORKDIR /soft
RUN git clone -b ${BRANCH} --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 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& ldconfig \ && ldconfig \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \

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

@@ -12,7 +12,7 @@ WORKDIR /soft
RUN git clone -b ${BRANCH} --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 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& ldconfig \ && ldconfig \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \

2
docker/linux_cross-shstk/Dockerfile
View File

@@ -18,7 +18,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& ldconfig && ldconfig
WORKDIR /soft/shstk_build WORKDIR /soft/shstk_build
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf * && rm -rf *

2
docker/linux_desktop-shstk/Dockerfile
View File

@@ -12,7 +12,7 @@ WORKDIR /soft
RUN git clone -b ${BRANCH} --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 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& ldconfig \ && ldconfig \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \

2
docker/osx-shstk/Dockerfile
View File

@@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& ldconfig && ldconfig
WORKDIR /soft/shstk_build_osx WORKDIR /soft/shstk_build_osx
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf * && rm -rf *

2
docker/pi-shstk/Dockerfile
View File

@@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& ldconfig && ldconfig
WORKDIR /soft/shstk_build_pi WORKDIR /soft/shstk_build_pi
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf * && rm -rf *

2
docker/windows-shstk/Dockerfile
View File

@@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& ldconfig && ldconfig
WORKDIR /soft/shstk_build_windows WORKDIR /soft/shstk_build_windows
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf * && rm -rf *

2
docker/windows32-shstk/Dockerfile
View File

@@ -16,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& ldconfig && ldconfig
WORKDIR /soft/shstk_build_windows32 WORKDIR /soft/shstk_build_windows32
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \ RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf * && rm -rf *

2
pip

Submodule pip updated: cae264a77b...9b8a1583c2