From 6a26324d620a5eb02978d96a98b6a91f3dae9021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=BB?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 15:39:00 +0300 Subject: [PATCH 01/10] release branch for Dockerfile --- docker/debian-shstk/Dockerfile | 2 +- docker/debian11-shstk/Dockerfile | 2 +- docker/ubuntu-shstk/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/debian-shstk/Dockerfile b/docker/debian-shstk/Dockerfile index fbce5bd..67ce6be 100644 --- a/docker/debian-shstk/Dockerfile +++ b/docker/debian-shstk/Dockerfile @@ -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 \ diff --git a/docker/debian11-shstk/Dockerfile b/docker/debian11-shstk/Dockerfile index 5c2e8ed..5555e28 100644 --- a/docker/debian11-shstk/Dockerfile +++ b/docker/debian11-shstk/Dockerfile @@ -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 \ diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile index 2f759f5..79aeef1 100644 --- a/docker/ubuntu-shstk/Dockerfile +++ b/docker/ubuntu-shstk/Dockerfile @@ -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 \ From 97254230749a17ddb76ddb4452c27c7b70afff26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=BB?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 17:00:04 +0300 Subject: [PATCH 02/10] update cmake --- cmake | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index 6063123..ff7ec23 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6063123ee014bb84f3aa4e3a8bbb4bddd390f094 +Subproject commit ff7ec2320cb943640615632daad39a01b307d595 diff --git a/qad b/qad index ebe7f3f..9c17b39 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ebe7f3fc73f8f08142a4d38c3bf49d019a7da7ad +Subproject commit 9c17b394090569a1ee6df7eb10c7d943a6ecf4b2 From 9fddb4445a5ed63b7bacf2e5999a65e98ad501f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=BB?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 17:10:09 +0300 Subject: [PATCH 03/10] fix Jenkinsfile --- Jenkinsfile | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d14f2cd..3583e6b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,6 +20,10 @@ def build_docker(name, release_dir) { return "\n - ${image_name}" } node { + options { + copyArtifactPermission('*'); + buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10")) + } stage("checkout") { checkout scm } @@ -49,30 +53,3 @@ 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' - } - } - } -} From bde2c85591c40e9870eae64dd4df802789f5956c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 17:12:51 +0300 Subject: [PATCH 04/10] fix Jenkinsfile 2 --- Jenkinsfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3583e6b..a900e27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,10 +20,6 @@ def build_docker(name, release_dir) { return "\n - ${image_name}" } node { - options { - copyArtifactPermission('*'); - buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10")) - } stage("checkout") { checkout scm } @@ -53,3 +49,12 @@ node { archiveArtifacts 'release/*' echo "${_msg}" } +pipeline { + agent { + label 'master' + } + options { + copyArtifactPermission('*'); + buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10")) + } +} From e0f493534510422cb1b77cbc978edb8b7906bb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 17:13:45 +0300 Subject: [PATCH 05/10] fix Jenkinsfile 3 --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a900e27..ad70845 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,4 +57,5 @@ pipeline { copyArtifactPermission('*'); buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10")) } + stages {} } From 41dbad59210c970c8e7790e29a5d71960c7752dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 9 Jun 2022 17:23:49 +0300 Subject: [PATCH 06/10] fix Jenkinsfile 4 --- Jenkinsfile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ad70845..5547efe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +19,7 @@ def build_docker(name, release_dir) { } return "\n - ${image_name}" } +properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '20']], copyArtifactPermission('*')]); node { stage("checkout") { checkout scm @@ -49,13 +50,4 @@ node { archiveArtifacts 'release/*' echo "${_msg}" } -pipeline { - agent { - label 'master' - } - options { - copyArtifactPermission('*'); - buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10")) - } - stages {} -} + From 9377c30c58c65b1fe3c68601d86b979afae5eb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Fri, 24 Jun 2022 14:49:42 +0300 Subject: [PATCH 07/10] =?UTF-8?q?pip=5Fcmg=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20+=20gif=20record=20=D0=B2=20graohic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 831f202..33eefd7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 831f2025368b200076d68d6611b790340ad31a98 +Subproject commit 33eefd7453f2d20c5cef550de2ea792ade22b782 diff --git a/qad b/qad index 9c17b39..af530b5 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9c17b394090569a1ee6df7eb10c7d943a6ecf4b2 +Subproject commit af530b582cb1ad346e0a26cbfba003124ca8b87e From 925e49656151f41ffd052e0ae6a0b529a8b92f5f Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 24 Jun 2022 16:44:53 +0300 Subject: [PATCH 08/10] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 33eefd7..e96b399 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 33eefd7453f2d20c5cef550de2ea792ade22b782 +Subproject commit e96b399da7ab6c9a3d2554e2ec0b8c8ee7400831 From e57a2a636450ab4539f3fec7b6441ead8a4f8a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 30 Jun 2022 17:56:55 +0300 Subject: [PATCH 09/10] =?UTF-8?q?qad=5Ftypes=20=D0=B4=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B8,=20cmake=20bat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index ff7ec23..fb28f9b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ff7ec2320cb943640615632daad39a01b307d595 +Subproject commit fb28f9b1b24f34a79cf393359b7945e834a3c176 diff --git a/qad b/qad index af530b5..2fb937a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit af530b582cb1ad346e0a26cbfba003124ca8b87e +Subproject commit 2fb937a0904c25d1f7f2cd95d2d1452efa96f350 From 4195aa9f52d038836286a5ece48ccbe4fe8b5909 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 4 Aug 2022 11:37:46 +0300 Subject: [PATCH 10/10] update qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 2fb937a..4c0e61f 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 2fb937a0904c25d1f7f2cd95d2d1452efa96f350 +Subproject commit 4c0e61fdb6a4efd09aec267331699c8cc41ae892