From 67476644ddfe4eeedf85203bd1570915127ad114 Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 16 Jul 2021 14:32:27 +0300 Subject: [PATCH 1/3] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 040eb3b..686c970 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 040eb3b279b947583d4068cd7f156c681cdd4f08 +Subproject commit 686c970e84c4a96dfc82cbb264c4a9563968d2c9 -- 2.43.0 From dab9f3185f3f182c7492d72defd47acba76dd4e0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 24 Jul 2021 16:33:42 +0300 Subject: [PATCH 2/3] add deploy --- docker/debian-shstk/Dockerfile | 1 + docker/osx-shstk/Dockerfile | 4 +++- docker/pi-shstk/Dockerfile | 4 +++- docker/ubuntu-shstk/Dockerfile | 1 + docker/windows-shstk/Dockerfile | 4 +++- docker/windows32-shstk/Dockerfile | 4 +++- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docker/debian-shstk/Dockerfile b/docker/debian-shstk/Dockerfile index 05586d7..71ab924 100644 --- a/docker/debian-shstk/Dockerfile +++ b/docker/debian-shstk/Dockerfile @@ -11,6 +11,7 @@ RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.to WORKDIR /soft/shstk_build_debian 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 deploy -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index a58e941..989eadd 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ 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/ \ - && make install -j${JOBS_COUNT} && rm -rf * + && make install -j${JOBS_COUNT} \ + && make deploy -j${JOBS_COUNT} \ + && rm -rf * WORKDIR /soft/src diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 1e80fdf..57a82b5 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ 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/ \ - && make install -j${JOBS_COUNT} && rm -rf * + && make install -j${JOBS_COUNT} \ + && make deploy -j${JOBS_COUNT} \ + && rm -rf * WORKDIR /soft/src diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile index c2af254..15d0c76 100644 --- a/docker/ubuntu-shstk/Dockerfile +++ b/docker/ubuntu-shstk/Dockerfile @@ -11,6 +11,7 @@ RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.to WORKDIR /soft/shstk_build_ubuntu 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 deploy -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index 6e41791..c43be7e 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ 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/ \ - && make install -j${JOBS_COUNT} && rm -rf * + && make install -j${JOBS_COUNT} \ + && make deploy -j${JOBS_COUNT} \ + && rm -rf * WORKDIR /soft/src diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index 017485f..65549cb 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -16,6 +16,8 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ 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/ \ - && make install -j${JOBS_COUNT} && rm -rf * + && make install -j${JOBS_COUNT} \ + && make deploy -j${JOBS_COUNT} \ + && rm -rf * WORKDIR /soft/src -- 2.43.0 From e0bb28560d03aa5327e6e8660895e9157d132c64 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 24 Jul 2021 16:34:13 +0300 Subject: [PATCH 3/3] pip, Jenkinsfile --- Jenkinsfile | 11 +++++++++-- pip | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc43c82..282715c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -def build_docker(name) { +def build_docker(name, release_dir) { def image = "${name}-shstk" echo "Build image ${image}" 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}" dir ("docker/${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}" } @@ -19,6 +22,8 @@ node { stage("checkout") { checkout scm } + def rel_dir = sh(script: "pwd", returnStdout: true) + '/release' + echo "Release to ${rel_dir}" def _envmap = [:] def _env = sh(script: "env", returnStdout: true).trim().split("\n") _env.each{ l -> @@ -27,16 +32,18 @@ node { def _v = l.substring(_ind + 1); _envmap["${_n}"] = "${_v}"; } + sh "mkdir -p ${rel_dir}" def _msg = "Built images:" def platforms = ['debian', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu'] for (int i = 0; i < platforms.size(); ++i) { if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-shstk") { - _msg += build_docker("${platforms[i]}") + _msg += build_docker("${platforms[i]}", rel_dir) } } } sh "docker system prune -f" + archiveArtifacts '${rel_dir}/*' echo "${_msg}" } pipeline { diff --git a/pip b/pip index 686c970..ca44846 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 686c970e84c4a96dfc82cbb264c4a9563968d2c9 +Subproject commit ca44846240f3680cdff199d6943ecb13826b15ce -- 2.43.0