From 7713ca18f7d443f874224f5c99f58575c8c6f0c8 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 2 Nov 2024 14:15:59 +0300 Subject: [PATCH 01/12] cd, pip, qad, qglengine --- cd | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cd b/cd index 0c36565..b65bf5e 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 0c36565aecc0630730225d9ce55186c3117914b8 +Subproject commit b65bf5e6406108a9f53627a308419b51d41e2e4e diff --git a/pip b/pip index 9f1d23a..df75efe 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 9f1d23ad8ef5ee40ad21fb029e7ddb4bf59929f0 +Subproject commit df75efe8810c6a7d0dda9b343ff4c4f2c58ccf08 diff --git a/qad b/qad index f8fec93..8f969a1 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f8fec93f0e99645b09c1d85dcdff47f2df1f0f68 +Subproject commit 8f969a1b41f89d6fe4694aa7fcbc00963b8cd086 diff --git a/qglengine b/qglengine index 7dfaf92..5a71585 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 7dfaf924e5c41dd69100a06c4ba35465621ea5d8 +Subproject commit 5a7158531f1b011fbcea0c16fd0dcf1f28a4bfce From 71b3272d1b32f8b8f97ffb3f4b74048ba0b5c8e0 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 10 Nov 2024 21:29:44 +0300 Subject: [PATCH 02/12] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index df75efe..5b066cb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit df75efe8810c6a7d0dda9b343ff4c4f2c58ccf08 +Subproject commit 5b066cbc27c274248d609e0d5c1e80188abac637 diff --git a/qad b/qad index 8f969a1..1becca7 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 8f969a1b41f89d6fe4694aa7fcbc00963b8cd086 +Subproject commit 1becca7519b0a8ab2babe8e74288d2bb9c9d72d9 From 100421bed659153b06607259a6b1c40c778681cb Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:18:56 +0300 Subject: [PATCH 03/12] testing support --- Jenkinsfile | 16 +++++++++++++--- pip | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df09ae2..d355b36 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,10 @@ @Library('SHS.Platforms') _ -def build_docker(dist, release_dir) { +def build_docker(dist, release_dir, is_testing) { def image_name = "${dist.docker_image}-shstk" + if (is_testing) { + image_name += "-test" + } + echo "Build image ${image_name}" def args = "" for (arg in dist.docker_build_options) { @@ -23,18 +27,24 @@ node { stage("Download SRC") { checkout scm } - + + def currentBranch = "${env.BRANCH_NAME}" + def is_testing = currentBranch.toLowerCase().contains("test") + def pl = new org.SHS.Platforms(this) pl.get() def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' + if (is_testing) { + rel_dir += "-test" + } echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist, rel_dir) + _msg += build_docker(dist, rel_dir, is_testing) }, stageSuffix: "-shstk", ondemand: true diff --git a/pip b/pip index 5b066cb..ee137b2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 5b066cbc27c274248d609e0d5c1e80188abac637 +Subproject commit ee137b2820a8ca39a41031a893c904725ca21cfc From c4ead44fde12e2a35925462134841355a621db07 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:40:01 +0300 Subject: [PATCH 04/12] pass branch name to docker build --- Jenkinsfile | 3 +++ docker/android-shstk/Dockerfile | 3 ++- docker/astra1.7-shstk/Dockerfile | 3 ++- docker/astra1.8-shstk/Dockerfile | 3 ++- docker/linux_cross-shstk/Dockerfile | 3 ++- docker/linux_desktop-shstk/Dockerfile | 3 ++- docker/osx-shstk/Dockerfile | 3 ++- docker/pi-shstk/Dockerfile | 3 ++- docker/windows-shstk/Dockerfile | 3 ++- docker/windows32-shstk/Dockerfile | 3 ++- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d355b36..69d867d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,9 @@ def build_docker(dist, release_dir, is_testing) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } + if (env.BRANCH_NAME) { + args += " --build-arg BRANCH=${env.BRANCH_NAME}" + } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index cb535f7..5da7a53 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}android ARG LIBS_BUILD_NUMBER=9999 @@ -10,7 +11,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ENV NDK_PLATFORM="android-21" WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index cc83f19..0a0888e 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index 4e67335..ed3cb66 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}osx ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 363b367..d03ce70 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}pi ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index e11e48f..a513296 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}windows ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index d454355..c1e07fb 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}windows32 ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ From 67272f91492f0500cf51aabcb10d24996c06da3f Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:42:22 +0300 Subject: [PATCH 05/12] try --- docker/astra1.7-shstk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index fabcc20..715fc66 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,6 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG IMAGE_FROM ARG BRANCH=release +ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 From 4eadb31df2ea983ad50c5cdfdbc099c42c81402c Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:47:15 +0300 Subject: [PATCH 06/12] try2 --- docker/astra1.7-shstk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index 715fc66..875e581 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release ARG IMAGE_FROM FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 From b0d08801b7901bedc9e7ce256a47208078678c48 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:49:37 +0300 Subject: [PATCH 07/12] Dockerfiles fix --- docker/android-shstk/Dockerfile | 2 +- docker/astra1.8-shstk/Dockerfile | 2 +- docker/linux_cross-shstk/Dockerfile | 2 +- docker/linux_desktop-shstk/Dockerfile | 2 +- docker/osx-shstk/Dockerfile | 2 +- docker/pi-shstk/Dockerfile | 2 +- docker/windows-shstk/Dockerfile | 2 +- docker/windows32-shstk/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index 5da7a53..2dfc9af 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}android +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index fabcc20..875e581 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 0a0888e..9e9f80b 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index fabcc20..875e581 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,8 +1,8 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM -ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ARG support_gl=1 diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index ed3cb66..9c23f44 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}osx +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index d03ce70..e06ab48 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}pi +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index a513296..4f6c40d 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}windows +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index c1e07fb..c8844c4 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_PREFIX=wapmobil/ -ARG BRANCH=release FROM ${DOCKER_PREFIX}windows32 +ARG BRANCH=release ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH From fe5eeac297a90f4a9b0668e64dd353ecac9121ac Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 15:43:18 +0300 Subject: [PATCH 08/12] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ee137b2..3d07795 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ee137b2820a8ca39a41031a893c904725ca21cfc +Subproject commit 3d077955159247549a139a323956772a31c158eb From 9eba538a5640dfff7b59145e068afc9fb87f70f4 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 15:48:12 +0300 Subject: [PATCH 09/12] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 3d07795..047d38e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3d077955159247549a139a323956772a31c158eb +Subproject commit 047d38ea594fc4751ce32df4c9f28ae20bfeaa67 From da1883822c9741308817f1f40962e00adaee5abd Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 16:23:55 +0300 Subject: [PATCH 10/12] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 047d38e..c67f7a2 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 047d38ea594fc4751ce32df4c9f28ae20bfeaa67 +Subproject commit c67f7a2b64aa32c7790e965826f82f126988af93 From 058f8d4026990628562d0022fe008aa82d315cc6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 17:14:25 +0300 Subject: [PATCH 11/12] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c67f7a2..f6b9131 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c67f7a2b64aa32c7790e965826f82f126988af93 +Subproject commit f6b9131f4a4e915f1ede9221ba4857333daf8199 From 98c9ef3b9b6c8e35c794cab7b20583926706c385 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 18:02:34 +0300 Subject: [PATCH 12/12] Jenkinsfile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69d867d..21c7b64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,10 +37,11 @@ node { def pl = new org.SHS.Platforms(this) pl.get() - def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release' + def local_release_dir = 'release' if (is_testing) { - rel_dir += "-test" + local_release_dir += '-test' } + def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir echo "Release to ${rel_dir}" sh "rm -rvf ${rel_dir}" sh "mkdir -p ${rel_dir}" @@ -57,7 +58,7 @@ node { sh "docker system prune -f" } - archiveArtifacts 'release/*' + archiveArtifacts "${local_release_dir}/*" echo "${_msg}" }