You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/09/28 09:06:59 UTC
[1/3] git commit: [flex-falcon] [refs/heads/develop] - - Updated the
Jenkinsfile to only deploy artifacts from the "develop" branch.
Repository: flex-falcon
Updated Branches:
refs/heads/develop d46bbe831 -> 7aa48afbf
- Updated the Jenkinsfile to only deploy artifacts from the "develop" branch.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/21691573
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/21691573
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/21691573
Branch: refs/heads/develop
Commit: 21691573f7f9cd28013a3601fd11c83217a3e59e
Parents: 7405eca
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 27 16:52:34 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 27 16:52:34 2016 +0200
----------------------------------------------------------------------
Jenkinsfile | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/21691573/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 79db3d3..8805802 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,6 +34,12 @@ node('windows-2012-1') {
env.FLASHPLAYER_DEBUGGER = "C:\\Program Files (x86)\\Adobe\\flashplayer_22_sa_debug.exe"
env.PATH = "${tool 'Maven 3 (latest)'}\\bin;${env.PATH}"
+ // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
+ var mavenGoal = "install"
+ if(env.BRANCH_NAME == 'develop') {
+ mavenGoal = "deploy"
+ }
+
try {
stage 'Wipe Workspace'
@@ -58,31 +64,27 @@ node('windows-2012-1') {
dir('compiler') {
echo 'Building FlexJS Compiler'
- bat 'mvn -U clean deploy -s C:\\.m2\\settings.xml -P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e'
+ bat 'mvn -U clean $mavenGoal -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 deploy -s C:\\.m2\\settings.xml -P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e'
+ bat 'mvn -U clean $mavenGoal -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 install -s C:\\.m2\\settings.xml -P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e'
+ bat 'mvn -U clean $mavenGoal -s C:\\.m2\\settings.xml -P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e'
}
stage 'Release Site Changes'
echo 'Releasing Site Changes'
- stage 'Cleanup'
-
- echo 'Cleaning up'
-
}
@@ -92,9 +94,9 @@ node('windows-2012-1') {
mail body: "project build error is here: ${env.BUILD_URL}" ,
from: 'xxxx@yyyy.com',
- replyTo: 'yyyy@yyyy.com',
- subject: 'project build failed',
- to: 'zzzz@yyyyy.com'
+ replyTo: 'dev@flex.apache.org',
+ subject: 'Autobuild for Branch ' env.BRANCH_NAME,
+ to: 'commits@flex.apache.org'
throw err
}
[2/3] git commit: [flex-falcon] [refs/heads/develop] - Merge
remote-tracking branch 'origin/develop' into develop
Posted by cd...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7735a2d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7735a2d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7735a2d3
Branch: refs/heads/develop
Commit: 7735a2d393126cc73cb1300bfde83a5deb052eaf
Parents: 2169157 e880f34
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 27 23:01:02 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 27 23:01:02 2016 +0200
----------------------------------------------------------------------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 77 +++++++++++++++++++-
.../driver/js/goog/JSGoogConfiguration.java | 46 ++++++++++++
.../internal/projects/FlexJSProject.java | 24 ++++++
3 files changed, 144 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: [flex-falcon] [refs/heads/develop] - Merge
remote-tracking branch 'origin/develop' into develop
Posted by cd...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7aa48afb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7aa48afb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7aa48afb
Branch: refs/heads/develop
Commit: 7aa48afbf1f0bf4f114e2649b1ec8acb840ab347
Parents: 7735a2d d46bbe8
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 27 23:23:02 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 27 23:23:02 2016 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/TestFlexJSClass.java | 4 ++--
.../compiler/internal/codegen/js/goog/TestGoogProject.java | 8 ++++----
.../compiler/internal/codegen/js/vf2js/TestVF2JSClass.java | 2 +-
.../org/apache/flex/compiler/internal/test/TestBase.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------