flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/feature-autobuild/maven-archetypes] - - Tried to fix a problem with the Jenkinsfile and dynamic branch names
Date Wed, 28 Sep 2016 18:32:38 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/feature-autobuild/maven-archetypes e152a8abf -> 128246ebb


- Tried to fix a problem with the Jenkinsfile and dynamic branch names


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/128246eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/128246eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/128246eb

Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 128246ebbed743178ed64a06340ebf4dbabdec45
Parents: e152a8a
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Wed Sep 28 20:32:32 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Wed Sep 28 20:32:32 2016 +0200

----------------------------------------------------------------------
 Jenkinsfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/128246eb/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 9b349dc..b9b899d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,8 +36,10 @@ node('windows-2012-1') {
 
     // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
     def mavenGoal = "install"
+    def mavenLocalRepo = ""
     if(env.BRANCH_NAME == 'develop') {
         mavenGoal = "deploy"
+        mavenLocalRepo = "-Dmaven.repo.local=..\\.repository"
     }
 
     try {
@@ -61,21 +63,21 @@ node('windows-2012-1') {
 
             dir('compiler') {
                 echo 'Building FlexJS Compiler'
-                bat "mvn -U clean ${mavenGoal} -Dmaven.repo.local=..\\.repository -s C:\\.m2\\settings.xml
-P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e"
+                bat "mvn -U clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml
-P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e"
             }
 
         stage 'Build FlexJS Typedefs'
 
             dir('typedefs') {
                 echo 'Building FlexJS Typedefs'
-                bat "mvn -U clean ${mavenGoal} -Dmaven.repo.local=..\\.repository -s C:\\.m2\\settings.xml
-P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e"
+                bat "mvn -U clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml
-P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e"
             }
 
         stage 'Build FlexJS Framework'
 
             dir('framework') {
                 echo 'Building FlexJS Framework'
-                bat "mvn -U clean ${mavenGoal} -Dmaven.repo.local=..\\.repository -s C:\\.m2\\settings.xml
-P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e"
+                bat "mvn -U clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml
-P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e"
             }
 
         stage 'Release Site Changes'


Mime
View raw message