From 4eadb31df2ea983ad50c5cdfdbc099c42c81402c Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:47:15 +0300 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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}" }