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

master #89

Merged
peri4 merged 5 commits from master into release 2021-07-24 16:34:51 +03:00
Conversation 0 Commits 5 Files Changed 8 +24 -7
8 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Jenkinsfile vendored
View File

@@ -1,4 +1,4 @@
def build_docker(name) { def build_docker(name, release_dir) {
def image = "${name}-shstk" def image = "${name}-shstk"
echo "Build image ${image}" echo "Build image ${image}"
def pref = "" def pref = ""
@@ -12,6 +12,9 @@ def build_docker(name) {
def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}" def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}"
dir ("docker/${image}") { dir ("docker/${image}") {
sh "docker build ${args} --no-cache -t ${image} ." sh "docker build ${args} --no-cache -t ${image} ."
docker.image('${image}').inside('-v ${release_dir}:/soft/release') {
sh 'cp -vf /soft/shstk/release/* /soft/release/'
}
} }
return "\n - ${image}" return "\n - ${image}"
} }
@@ -19,6 +22,8 @@ node {
stage("checkout") { stage("checkout") {
checkout scm checkout scm
} }
def rel_dir = sh(script: "pwd", returnStdout: true) + '/release'
echo "Release to ${rel_dir}"
def _envmap = [:] def _envmap = [:]
def _env = sh(script: "env", returnStdout: true).trim().split("\n") def _env = sh(script: "env", returnStdout: true).trim().split("\n")
_env.each{ l -> _env.each{ l ->
@@ -27,16 +32,18 @@ node {
def _v = l.substring(_ind + 1); def _v = l.substring(_ind + 1);
_envmap["${_n}"] = "${_v}"; _envmap["${_n}"] = "${_v}";
} }
sh "mkdir -p ${rel_dir}"
def _msg = "Built images:" def _msg = "Built images:"
def platforms = ['debian', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu'] def platforms = ['debian', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu']
for (int i = 0; i < platforms.size(); ++i) { for (int i = 0; i < platforms.size(); ++i) {
if (_envmap["BUILD_${platforms[i]}"] == "1") { if (_envmap["BUILD_${platforms[i]}"] == "1") {
stage("${platforms[i]}-shstk") { stage("${platforms[i]}-shstk") {
_msg += build_docker("${platforms[i]}") _msg += build_docker("${platforms[i]}", rel_dir)
} }
} }
} }
sh "docker system prune -f" sh "docker system prune -f"
archiveArtifacts '${rel_dir}/*'
echo "${_msg}" echo "${_msg}"
} }
pipeline { pipeline {

1
docker/debian-shstk/Dockerfile
View File

@@ -11,6 +11,7 @@ RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.to
WORKDIR /soft/shstk_build_debian WORKDIR /soft/shstk_build_debian
RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& make install -j${JOBS_COUNT} \ && make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
&& rm -rf * \ && rm -rf * \
&& ldconfig && ldconfig

4
docker/osx-shstk/Dockerfile
View File

@@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
WORKDIR /soft/shstk_build_osx WORKDIR /soft/shstk_build_osx
RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \ RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
&& make install -j${JOBS_COUNT} && rm -rf * && make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
&& rm -rf *
WORKDIR /soft/src WORKDIR /soft/src

4
docker/pi-shstk/Dockerfile
View File

@@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
WORKDIR /soft/shstk_build_pi WORKDIR /soft/shstk_build_pi
RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
&& make install -j${JOBS_COUNT} && rm -rf * && make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
&& rm -rf *
WORKDIR /soft/src WORKDIR /soft/src

1
docker/ubuntu-shstk/Dockerfile
View File

@@ -11,6 +11,7 @@ RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.to
WORKDIR /soft/shstk_build_ubuntu WORKDIR /soft/shstk_build_ubuntu
RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& make install -j${JOBS_COUNT} \ && make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
&& rm -rf * \ && rm -rf * \
&& ldconfig && ldconfig

4
docker/windows-shstk/Dockerfile
View File

@@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
WORKDIR /soft/shstk_build_windows WORKDIR /soft/shstk_build_windows
RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \ RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
&& make install -j${JOBS_COUNT} && rm -rf * && make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
&& rm -rf *
WORKDIR /soft/src WORKDIR /soft/src

4
docker/windows32-shstk/Dockerfile
View File

@@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
WORKDIR /soft/shstk_build_windows32 WORKDIR /soft/shstk_build_windows32
RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \ RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
&& make install -j${JOBS_COUNT} && rm -rf * && make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
&& rm -rf *
WORKDIR /soft/src WORKDIR /soft/src

2
pip

Submodule pip updated: 040eb3b279...ca44846240