Compare commits

...

11 Commits

Author SHA1 Message Date
4195aa9f52 update qad
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
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
2022-06-30 17:56:55 +03:00
925e496561 pip
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
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
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
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
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
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
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
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
2022-06-09 15:39:07 +03:00
Бычков Анлрей
6a26324d62 release branch for Dockerfile 2022-06-09 15:39:00 +03:00
7 changed files with 8 additions and 33 deletions

29
Jenkinsfile vendored
View File

@@ -19,6 +19,7 @@ def build_docker(name, release_dir) {
}
return "\n - ${image_name}"
}
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]);
node {
stage("checkout") {
checkout scm
@@ -49,30 +50,4 @@ node {
archiveArtifacts 'release/*'
echo "${_msg}"
}
pipeline {
agent {
label 'master'
}
options {
copyArtifactPermission('*');
buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10"))
}
stages {
stage("PIP doc") {
steps {
checkout scm
sh "rm -rf share"
sh "rm -vf *.zip"
sh "mkdir -p build"
sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` -DDOC_LANG=English -DDOC_DIR=en ../ && make doc"
sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` -DDOC_LANG=Russian -DDOC_DIR=ru ../ && make doc"
sh "cd share/doc && zip -r ../../pip_doc.zip pip"
sh "cp share/doc/pip/html/en/pip_en.qch ./"
sh "cp share/doc/pip/html/ru/pip_ru.qch ./"
archiveArtifacts 'pip_doc.zip'
archiveArtifacts 'pip_en.qch'
archiveArtifacts 'pip_ru.qch'
}
}
}
}

2
cmake

Submodule cmake updated: 6063123ee0...fb28f9b1b2

View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
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
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
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
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

View File

@@ -6,7 +6,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
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
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: 831f202536...e96b399da7

2
qad

Submodule qad updated: ebe7f3fc73...4c0e61fdb6