From 2945c07a317951f2fe74027257e1886f8bcd7902 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 28 May 2020 14:04:35 +0300 Subject: [PATCH 1/7] Jenkinsfile pip doc --- Jenkinsfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 19b1d7e..af9e9a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,5 +37,18 @@ node { } } sh "docker system prune -f" + stage("PIP doc") { + agent { + label 'master' + } + checkout scm + sh "rm -rf share" + sh "rm -v *.zip" + sh "mkdir -p build" + sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" + sh "cd build && make doc" + sh "cd share/doc && zip -r ../../pip_doc.zip pip" + archiveArtifacts 'pip_doc.zip' + } echo "${_msg}" } From ab356664e2166b5c6d8224fa2095c846f9e2023b 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, 28 May 2020 14:21:30 +0300 Subject: [PATCH 2/7] pip PIVector2D resize --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 6b9fa87..988ebac 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 6b9fa87570c22b7137d9ead68a1c662cf2416b75 +Subproject commit 988ebac3b74c09db2ab4b5f4f1981365ccfdd184 From 3c94cce018d41272f753d609f55eafcbf0a0cde0 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 28 May 2020 14:44:20 +0300 Subject: [PATCH 3/7] Jenkinsfile --- Jenkinsfile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index af9e9a7..f9324b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ node { for (int i = 0; i < platforms.size(); ++i) { if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-libs") { - _msg += build_docker("${platforms[i]}") + //_msg += build_docker("${platforms[i]}") } } } @@ -41,14 +41,16 @@ node { agent { label 'master' } - checkout scm - sh "rm -rf share" - sh "rm -v *.zip" - sh "mkdir -p build" - sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" - sh "cd build && make doc" - sh "cd share/doc && zip -r ../../pip_doc.zip pip" - archiveArtifacts 'pip_doc.zip' + steps { + checkout scm + sh "rm -rf share" + sh "rm -v *.zip" + sh "mkdir -p build" + sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" + sh "cd build && make doc" + sh "cd share/doc && zip -r ../../pip_doc.zip pip" + archiveArtifacts 'pip_doc.zip' + } } echo "${_msg}" } From 007e3db9ef38250779f0f4d994f2c72b83c73b3a Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 28 May 2020 14:59:04 +0300 Subject: [PATCH 4/7] Jenkinsfile --- Jenkinsfile | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f9324b4..856c8f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,20 +37,24 @@ node { } } sh "docker system prune -f" - stage("PIP doc") { - agent { - label 'master' - } - steps { - checkout scm - sh "rm -rf share" - sh "rm -v *.zip" - sh "mkdir -p build" - sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" - sh "cd build && make doc" - sh "cd share/doc && zip -r ../../pip_doc.zip pip" - archiveArtifacts 'pip_doc.zip' - } - } echo "${_msg}" } +pipeline { + agent { + label 'master' + } + stages { + stage("PIP doc") { + steps { + checkout scm + sh "rm -rf share" + sh "rm -v *.zip" + sh "mkdir -p build" + sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" + sh "cd build && make doc" + sh "cd share/doc && zip -r ../../pip_doc.zip pip" + archiveArtifacts 'pip_doc.zip' + } + } + } +} From 1010eaf6dbb30889a2077474c5b3d1dcd4563b95 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 28 May 2020 15:00:25 +0300 Subject: [PATCH 5/7] Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 856c8f8..4d5d00d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { steps { checkout scm sh "rm -rf share" - sh "rm -v *.zip" + sh "rm -vf *.zip" sh "mkdir -p build" sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" sh "cd build && make doc" From b8e4e7203f36bf1da6a6840dd47b7e2d82c20264 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 28 May 2020 15:06:32 +0300 Subject: [PATCH 6/7] Jenkinsfile pip doc works --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4d5d00d..373967b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ node { for (int i = 0; i < platforms.size(); ++i) { if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-libs") { - //_msg += build_docker("${platforms[i]}") + _msg += build_docker("${platforms[i]}") } } } From a7f182a7cbfc26dd2ced36a016a71de6e45953df Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 28 May 2020 17:32:31 +0300 Subject: [PATCH 7/7] Jenkinsfile doc, PIP --- Jenkinsfile | 2 ++ pip | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 373967b..69f224c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,9 @@ pipeline { sh "cd build && cmake -DLIB=0 -DCMAKE_INSTALL_PREFIX=`pwd` ../" sh "cd build && make doc" sh "cd share/doc && zip -r ../../pip_doc.zip pip" + sh "cp share/doc/pip/html/index.qhp pip_doc.qhp" archiveArtifacts 'pip_doc.zip' + archiveArtifacts 'pip_doc.qhp' } } } diff --git a/pip b/pip index 988ebac..86b2530 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 988ebac3b74c09db2ab4b5f4f1981365ccfdd184 +Subproject commit 86b25303ef4ac78e639564cd2aa2901b9a77aeb2