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

Compare commits

base: SHS:pip_2.39
Branches Tags
SHS:release SHS:master SHS:test SHS:pip_2.39
..
compare: SHS:4d72bec4513ba933a7c0873816e7921ec0bdc5d0
Branches Tags
SHS:master SHS:release SHS:test SHS:pip_2.39

15 Commits
pip_2.39 ... 4d72bec451

Author SHA1 Message Date
Бычков Андрей
4d72bec451 Merge branch 'release' of https://git.shs.tools/SHS/shstk 2022-08-11 11:43:48 +03:00
Бычков Андрей
a74f845cee pip 2022-08-11 11:41:59 +03:00
peri4
af9493cf67 ready to release 2022-08-10 23:44:40 +03:00
peri4
da1c314ad8 pip v3 2022-08-10 22:58:21 +03:00
Andrey
4195aa9f52 update qad
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details
2022-08-04 11:37:46 +03:00
Бычков Андрей
e57a2a6364 qad_types доработки, cmake bat
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details
2022-06-30 17:56:55 +03:00
peri4
925e496561 pip
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details
2022-06-24 16:44:53 +03:00
Бычков Андрей
9377c30c58 pip_cmg правки + gif record в graohic
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details
2022-06-24 14:49:42 +03:00
Бычков Андрей
41dbad5921 fix Jenkinsfile 4
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details
2022-06-09 17:23:49 +03:00
Бычков Андрей
e0f4935345 fix Jenkinsfile 3
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Details
2022-06-09 17:13:45 +03:00
Бычков Андрей
bde2c85591 fix Jenkinsfile 2
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Details
2022-06-09 17:12:51 +03:00
Бычков Анлрей
9fddb4445a fix Jenkinsfile
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Details
2022-06-09 17:10:09 +03:00
Бычков Анлрей
9725423074 update cmake
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Details
2022-06-09 17:00:04 +03:00
Бычков Анлрей
08446a58ba Merge branch 'release' of https://git.shs.tools/SHS/shstk into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Details
2022-06-09 15:39:07 +03:00
Бычков Анлрей
6a26324d62 release branch for Dockerfile 2022-06-09 15:39:00 +03:00
9 changed files with 10 additions and 8 deletions
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
cd

Submodule cd updated: 7a16d76753...fcaddf6ec8

2
cmake

Submodule cmake updated: 61699f2283...46526851f5

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 \

2
pip

Submodule pip updated: 28ce6e8f3f...f07f814b08

2
qad

Submodule qad updated: 4c0e61fdb6...4e01ad4465

2
qglengine

Submodule qglengine updated: 37e2b236f5...c865f9fc94