Compare commits

..

2 Commits

Author SHA1 Message Date
Бычков Анлрей
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
8 changed files with 34 additions and 7 deletions

27
Jenkinsfile vendored
View File

@@ -49,3 +49,30 @@ 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
cd

Submodule cd updated: 7a16d76753...7164a8447c

2
cmake

Submodule cmake updated: 61699f2283...6063123ee0

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: 28ce6e8f3f...831f202536

2
qad

Submodule qad updated: 4c0e61fdb6...ebe7f3fc73