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

Merge branch 'release' of https://git.shs.tools/SHS/shstk

Browse Source
This commit is contained in:
Бычков Андрей
2022-08-11 11:43:48 +03:00
parent a74f845cee 4195aa9f52
commit 4d72bec451
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -19,6 +19,7 @@ def build_docker(name, release_dir) {
} }
return "\n - ${image_name}" return "\n - ${image_name}"
} }
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]);
node { node {
stage("checkout") { stage("checkout") {
checkout scm checkout scm
@@ -49,3 +50,4 @@ node {
archiveArtifacts 'release/*' archiveArtifacts 'release/*'
echo "${_msg}" echo "${_msg}"
} }

2
docker/debian-shstk/Dockerfile
View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft WORKDIR /soft
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
WORKDIR /soft/shstk_build_debian WORKDIR /soft/shstk_build_debian
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

2
docker/debian11-shstk/Dockerfile
View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft WORKDIR /soft
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
WORKDIR /soft/shstk_build_debian WORKDIR /soft/shstk_build_debian
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

2
docker/ubuntu-shstk/Dockerfile
View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft WORKDIR /soft
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
WORKDIR /soft/shstk_build_ubuntu WORKDIR /soft/shstk_build_ubuntu
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \