You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2019/04/11 22:57:12 UTC
[incubator-netbeans-tools] branch master updated: Do not pull if
using githashtag
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 188d996 Do not pull if using githashtag
188d996 is described below
commit 188d996e62f521680bedb21691b3368847b2a4fd
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Apr 12 00:57:01 2019 +0200
Do not pull if using githashtag
---
buildscripts/conveniences/generatebuildscript.sh | 16 +++++++++++-----
.../generated/Jenkinsfile-maven-release100.groovy | 2 +-
.../generated/Jenkinsfile-maven-release110.groovy | 2 +-
.../generated/Jenkinsfile-maven-release90.groovy | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/buildscripts/conveniences/generatebuildscript.sh b/buildscripts/conveniences/generatebuildscript.sh
index c8682de..b38902f 100644
--- a/buildscripts/conveniences/generatebuildscript.sh
+++ b/buildscripts/conveniences/generatebuildscript.sh
@@ -64,11 +64,14 @@ def write_pipelinebasic(afile,scm,jdktool,maventool,anttool,buildnumber):
afile.write(" }\n")
afile.write(" }\n")
-def write_pipelinecheckout(afile,scm):
+def write_pipelinecheckout(afile,scm,poll):
afile.write(" stage('SCM operation') {\n")
afile.write(" steps {\n")
afile.write(" echo 'Get NetBeans sources'\n")
- afile.write(" checkout([$class: 'GitSCM', branches: [[name: '"+scm+"']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]])\n")
+ if poll=="":
+ afile.write(" checkout([$class: 'GitSCM', branches: [[name: '"+scm+"']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]])\n")
+ else:
+ afile.write(" checkout poll:false, scm:[$class: 'GitSCM', branches: [[name: '"+scm+"']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]]\n")
afile.write(" }\n")
afile.write(" }\n")
@@ -130,8 +133,11 @@ for arelease in releaseinfo:
mavenbuildfile.write(" }\n")
mavenbuildfile.write(" }\n")
- write_pipelinecheckout(apidocbuildFile,branch)
- write_pipelinecheckout(mavenbuildfile,tag)
+ write_pipelinecheckout(apidocbuildFile,branch,"")
+ if branch=='refs/heads/master':
+ write_pipelinecheckout(mavenbuildfile,tag,"")
+ else:
+ write_pipelinecheckout(mavenbuildfile,tag,"poll:false")
## apidoc path do only build for javadoc
## build netbeans all needed for javadoc and nb-repository plugin
apidocbuildFile.write(" stage('NetBeans Builds') {\n")
@@ -168,7 +174,7 @@ for arelease in releaseinfo:
mavenbuildfile.write(" }\n")
mavenbuildfile.write(" }\n")
-#prepare maven artifacts
+#prepare maven artifacts
mavenbuildfile.write(" script {\n")
nbbuildpath = "${env.WORKSPACE}/netbeanssources/nbbuild"
mavenbuildfile.write(" sh 'rm -rf testrepo/.m2'\n")
diff --git a/buildscripts/conveniences/generated/Jenkinsfile-maven-release100.groovy b/buildscripts/conveniences/generated/Jenkinsfile-maven-release100.groovy
index e960b8a..2ab7f13 100644
--- a/buildscripts/conveniences/generated/Jenkinsfile-maven-release100.groovy
+++ b/buildscripts/conveniences/generated/Jenkinsfile-maven-release100.groovy
@@ -40,7 +40,7 @@ pipeline {
stage('SCM operation') {
steps {
echo 'Get NetBeans sources'
- checkout([$class: 'GitSCM', branches: [[name: '910bd74bf46d079e49925f702432c74d54ec705c']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]])
+ checkout poll:false, scm:[$class: 'GitSCM', branches: [[name: '910bd74bf46d079e49925f702432c74d54ec705c']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]]
}
}
stage('NetBeans Builds') {
diff --git a/buildscripts/conveniences/generated/Jenkinsfile-maven-release110.groovy b/buildscripts/conveniences/generated/Jenkinsfile-maven-release110.groovy
index 5e964f2..14d0fcb 100644
--- a/buildscripts/conveniences/generated/Jenkinsfile-maven-release110.groovy
+++ b/buildscripts/conveniences/generated/Jenkinsfile-maven-release110.groovy
@@ -40,7 +40,7 @@ pipeline {
stage('SCM operation') {
steps {
echo 'Get NetBeans sources'
- checkout([$class: 'GitSCM', branches: [[name: '275dea5557510c107cf9d193fe61555aacd544b1']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]])
+ checkout poll:false, scm:[$class: 'GitSCM', branches: [[name: '275dea5557510c107cf9d193fe61555aacd544b1']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]]
}
}
stage('NetBeans Builds') {
diff --git a/buildscripts/conveniences/generated/Jenkinsfile-maven-release90.groovy b/buildscripts/conveniences/generated/Jenkinsfile-maven-release90.groovy
index e5ee7cf..b8a0ee0 100644
--- a/buildscripts/conveniences/generated/Jenkinsfile-maven-release90.groovy
+++ b/buildscripts/conveniences/generated/Jenkinsfile-maven-release90.groovy
@@ -40,7 +40,7 @@ pipeline {
stage('SCM operation') {
steps {
echo 'Get NetBeans sources'
- checkout([$class: 'GitSCM', branches: [[name: '97904961e496383d6150aef9b78fa8dff8f3e1ce']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]])
+ checkout poll:false, scm:[$class: 'GitSCM', branches: [[name: '97904961e496383d6150aef9b78fa8dff8f3e1ce']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'netbeanssources']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans/']]]
}
}
stage('NetBeans Builds') {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists