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

Compare commits

base: SHS:4195aa9f52d038836286a5ece48ccbe4fe8b5909
Branches Tags
SHS:release SHS:master SHS:test SHS:pip_2.39
..
compare: SHS:pip_2.39
Branches Tags
SHS:master SHS:release SHS:test SHS:pip_2.39

11 Commits
4195aa9f52 ... pip_2.39

Author SHA1 Message Date
peri4
ea57bc5cbd pip 2.39 2022-08-08 10:36:38 +03:00
peri4
d8b843c8e8 PIP 2.99, new SHSTKMacros 2022-08-07 22:08:21 +03:00
Бычков Анлрей
56bd00ed11 Merge branch 'master' of https://git.shs.tools/SHS/shstk 2022-06-09 13:50:42 +03:00
Бычков Анлрей
2faecd4183 update submodules 2022-06-09 13:50:36 +03:00
Бычков Анлрей
e0f3df2217 Merge branch 'release' of https://git.shs.tools/SHS/shstk 2022-06-09 13:46:48 +03:00
peri4
000114b53f pip 2.39 and all other 2022-06-09 13:23:55 +03:00
peri4
17e292bc58 new PIP 2022-05-03 18:57:16 +03:00
peri4
0ab1cdaddd pip 2022-04-23 00:45:01 +03:00
peri4
f9385b74c4 pip 2022-04-22 23:25:35 +03:00
peri4
178f7ad40e pip 2022-04-22 21:53:05 +03:00
peri4
df7808a84f Jenkinsfile, pip 2022-04-22 21:19:31 +03:00
7 changed files with 6 additions and 8 deletions
Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -19,7 +19,6 @@ 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
@@ -50,4 +49,3 @@ node {
archiveArtifacts 'release/*' archiveArtifacts 'release/*'
echo "${_msg}" echo "${_msg}"
} }

2
cd

Submodule cd updated: 7164a8447c...7a16d76753

2
cmake

Submodule cmake updated: fb28f9b1b2...61699f2283

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 release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b master --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 release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b master --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 release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b master --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: e96b399da7...28ce6e8f3f