You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/07/03 13:13:37 UTC
[01/13] logging-log4net git commit: Jenkinsfile: provide -t when
building mono
Repository: logging-log4net
Updated Branches:
refs/heads/develop c88fc2619 -> 0ccb1e987
Jenkinsfile: provide -t when building mono
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4c2f5f39
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4c2f5f39
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4c2f5f39
Branch: refs/heads/develop
Commit: 4c2f5f39d94004617cb92503f86eb4ecc4025e81
Parents: c88fc26
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 13:36:57 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 13:36:57 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4c2f5f39/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index d4e0a7f..031af40 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
}
}
steps {
- sh "nant -buildfile:log4net.build compile-mono-2.0"
+ sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
archive 'bin/**/*.*'
}
}
@@ -71,7 +71,7 @@ pipeline {
}
}
steps {
- sh "nant -buildfile:log4net.build compile-mono-3.5"
+ sh "nant -t:mono-3.5 -buildfile:log4net.build compile-mono-3.5"
archive 'bin/**/*.*'
}
}
@@ -83,7 +83,7 @@ pipeline {
}
}
steps {
- sh "nant -buildfile:log4net.build compile-mono-4.0"
+ sh "nant -t:mono-4.0 -buildfile:log4net.build compile-mono-4.0"
archive 'bin/**/*.*'
}
}
[12/13] logging-log4net git commit: Jenkinsfile: attempt to fix stash
of site
Posted by dp...@apache.org.
Jenkinsfile: attempt to fix stash of site
This reverts commit b3cb9cb9b5ca5007a82774762c54c5aa8bfd6755.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/83c4229c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/83c4229c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/83c4229c
Branch: refs/heads/develop
Commit: 83c4229c9ec543c0a21f2273e9975fef92d41283
Parents: b3cb9cb
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:57:08 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:57:47 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/83c4229c/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 3962cfa..0ec4ed9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0"
- stash includes: 'bin/**.*', name: 'net-4.0-assemblies'
+ stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies'
}
}
stage('build net-4.0-cp') {
@@ -46,7 +46,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0-cp"
- stash includes: 'bin/**.*', name: 'net-4.0-cp-assemblies'
+ stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies'
}
}
stage('build net-4.5') {
@@ -57,7 +57,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.5"
- stash includes: 'bin/**.*', name: 'net-4.5-assemblies'
+ stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies'
}
}
stage('build mono-2.0') {
@@ -70,7 +70,7 @@ pipeline {
steps {
checkout scm
sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
- stash includes: 'bin/**.*', name: 'mono-2.0-assemblies'
+ stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
}
}
stage('build mono-3.5') {
@@ -83,7 +83,7 @@ pipeline {
steps {
checkout scm
sh "nant -t:mono-3.5 -buildfile:log4net.build compile-mono-3.5"
- stash includes: 'bin/**.*', name: 'mono-3.5-assemblies'
+ stash includes: 'bin/**/*.*', name: 'mono-3.5-assemblies'
}
}
stage('build mono-4.0') {
@@ -96,7 +96,7 @@ pipeline {
steps {
checkout scm
sh "nant -t:mono-4.0 -buildfile:log4net.build compile-mono-4.0"
- stash includes: 'bin/**.*', name: 'mono-4.0-assemblies'
+ stash includes: 'bin/**/*.*', name: 'mono-4.0-assemblies'
}
}
stage('build site') {
@@ -111,7 +111,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build generate-site"
- stash includes: 'target/site/**.*', name: 'site'
+ stash includes: 'target/site/**/*.*', name: 'site'
}
}
// TODO: testing needs to be refactored
@@ -148,7 +148,7 @@ pipeline {
}
post {
always {
- archive '**.*'
+ archive '**/*.*'
}
failure {
step([$class: 'Mailer', notifyEveryUnstableBuild: false, recipients: 'dev@logging.apache.org'])
[04/13] logging-log4net git commit: Jenkinsfile: refactor to build
assemblies in separate nodes and assemble them in one node that has no
checkout at all
Posted by dp...@apache.org.
Jenkinsfile: refactor to build assemblies in separate nodes and assemble them in one node that has no checkout at all
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2d7af0ed
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2d7af0ed
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2d7af0ed
Branch: refs/heads/develop
Commit: 2d7af0eda0e3eda39e1477fb3160aa994830343d
Parents: 42b7d58
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:11:29 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:11:29 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 72 +++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 51 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2d7af0ed/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 44defa0..bc4cb99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,15 +21,12 @@ pipeline {
options {
timeout(time: 1, unit: 'HOURS')
}
- agent { label 'Windows' }
- tools {
- maven 'Maven 3.3.9 (Windows)'
- jdk 'JDK 1.8 (latest)'
- }
- environment {
- // TODO: find a better way to determine nant installation path
- NAnt = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
+ agent {
+ label 'ubuntu'
+ skipDefaultCheckout()
}
+ // TODO: find a better way to determine nant installation path
+ def NANT = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
stages {
stage('checkout') {
steps {
@@ -37,18 +34,33 @@ pipeline {
}
}
stage('build net-4.0') {
+ agent { label 'Windows' }
+ environment {
+ NANT_BIN = NANT
+ }
steps {
- bat "${NAnt} -buildfile:log4net.build compile-net-4.0"
+ bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0"
+ stash includes: 'bin/**/*.*', name 'net-4.0-assemblies'
}
}
stage('build net-4.0-cp') {
+ agent { label 'Windows' }
+ environment {
+ NANT_BIN = NANT
+ }
steps {
- bat "${NAnt} -buildfile:log4net.build compile-net-4.0-cp"
+ bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0-cp"
+ stash includes: 'bin/**/*.*', name 'net-4.0-cp-assemblies'
}
}
stage('build net-4.5') {
+ agent { label 'Windows' }
+ environment {
+ NANT_BIN = NANT
+ }
steps {
- bat "${NAnt} -buildfile:log4net.build compile-net-4.5"
+ bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.5"
+ stash includes: 'bin/**/*.*', name 'net-4.5-assemblies'
}
}
stage('build mono-2.0') {
@@ -87,22 +99,40 @@ pipeline {
stash includes: 'bin/**/*.*', name: 'mono-4.0-assemblies'
}
}
- stage('prepare package') {
- steps {
- unstash 'mono-2.0-assemblies'
- unstash 'mono-3.5-assemblies'
- unstash 'mono-4.0-assemblies'
- }
- }
stage('build site') {
+ agent { label 'Windows' }
+ tools {
+ maven 'Maven 3.3.9 (Windows)'
+ jdk 'JDK 1.8 (latest)'
+ }
+ environment {
+ NANT_BIN = NANT
+ }
steps {
- bat "${NAnt} -buildfile:log4net.build generate-site"
+ bat "${NANT_BIN} -buildfile:log4net.build generate-site"
+ stash includes: 'target/site-deploy/**/*.*', name: 'site'
}
}
// TODO: testing needs to be refactored
stage('test on Windows') {
+ agent { label 'Windows' }
+ environment {
+ NANT_BIN = NANT
+ }
+ steps {
+ bat "${NANT_BIN} -buildfile:tests\\nant.build"
+ // TODO: stash test results
+ }
+ }
+ stage('prepare package') {
steps {
- bat "${NAnt} -buildfile:tests\\nant.build"
+ unstash 'net-4.0-assemblies'
+ unstash 'net-4.0-cp-assemblies'
+ unstash 'net-4.5-assemblies'
+ unstash 'mono-2.0-assemblies'
+ unstash 'mono-3.5-assemblies'
+ unstash 'mono-4.0-assemblies'
+ unstash 'site'
}
}
stage('deploy site') {
@@ -116,7 +146,7 @@ pipeline {
}
post {
always {
- archive 'bin/**/*.*'
+ archive '**/*.*'
}
failure {
step([$class: 'Mailer', notifyEveryUnstableBuild: false, recipients: 'dev@logging.apache.org'])
[03/13] logging-log4net git commit: Jenkinsfile: stash mono
assemblies instead of archiving them directly
Posted by dp...@apache.org.
Jenkinsfile: stash mono assemblies instead of archiving them directly
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/42b7d582
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/42b7d582
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/42b7d582
Branch: refs/heads/develop
Commit: 42b7d5829047b186337e458449d202fc82a051f2
Parents: b50c677
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 13:57:46 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 13:57:46 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/42b7d582/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 031af40..44defa0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
}
steps {
sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
- archive 'bin/**/*.*'
+ stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
}
}
stage('build mono-3.5') {
@@ -72,7 +72,7 @@ pipeline {
}
steps {
sh "nant -t:mono-3.5 -buildfile:log4net.build compile-mono-3.5"
- archive 'bin/**/*.*'
+ stash includes: 'bin/**/*.*', name: 'mono-3.5-assemblies'
}
}
stage('build mono-4.0') {
@@ -84,13 +84,14 @@ pipeline {
}
steps {
sh "nant -t:mono-4.0 -buildfile:log4net.build compile-mono-4.0"
- archive 'bin/**/*.*'
+ stash includes: 'bin/**/*.*', name: 'mono-4.0-assemblies'
}
}
- // TODO: testing needs to be refactored
- stage('test on Windows') {
+ stage('prepare package') {
steps {
- bat "${NAnt} -buildfile:tests\\nant.build"
+ unstash 'mono-2.0-assemblies'
+ unstash 'mono-3.5-assemblies'
+ unstash 'mono-4.0-assemblies'
}
}
stage('build site') {
@@ -98,6 +99,12 @@ pipeline {
bat "${NAnt} -buildfile:log4net.build generate-site"
}
}
+ // TODO: testing needs to be refactored
+ stage('test on Windows') {
+ steps {
+ bat "${NAnt} -buildfile:tests\\nant.build"
+ }
+ }
stage('deploy site') {
when {
branch 'master'
[11/13] logging-log4net git commit: Jenkinsfile: fixed stash includes
statements
Posted by dp...@apache.org.
Jenkinsfile: fixed stash includes statements
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b3cb9cb9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b3cb9cb9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b3cb9cb9
Branch: refs/heads/develop
Commit: b3cb9cb9b5ca5007a82774762c54c5aa8bfd6755
Parents: bcd2281
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:54:37 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:54:37 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b3cb9cb9/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 816c0c3..3962cfa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0"
- stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies'
+ stash includes: 'bin/**.*', name: 'net-4.0-assemblies'
}
}
stage('build net-4.0-cp') {
@@ -46,7 +46,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0-cp"
- stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies'
+ stash includes: 'bin/**.*', name: 'net-4.0-cp-assemblies'
}
}
stage('build net-4.5') {
@@ -57,7 +57,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.5"
- stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies'
+ stash includes: 'bin/**.*', name: 'net-4.5-assemblies'
}
}
stage('build mono-2.0') {
@@ -70,7 +70,7 @@ pipeline {
steps {
checkout scm
sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
- stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
+ stash includes: 'bin/**.*', name: 'mono-2.0-assemblies'
}
}
stage('build mono-3.5') {
@@ -83,7 +83,7 @@ pipeline {
steps {
checkout scm
sh "nant -t:mono-3.5 -buildfile:log4net.build compile-mono-3.5"
- stash includes: 'bin/**/*.*', name: 'mono-3.5-assemblies'
+ stash includes: 'bin/**.*', name: 'mono-3.5-assemblies'
}
}
stage('build mono-4.0') {
@@ -96,7 +96,7 @@ pipeline {
steps {
checkout scm
sh "nant -t:mono-4.0 -buildfile:log4net.build compile-mono-4.0"
- stash includes: 'bin/**/*.*', name: 'mono-4.0-assemblies'
+ stash includes: 'bin/**.*', name: 'mono-4.0-assemblies'
}
}
stage('build site') {
@@ -111,7 +111,7 @@ pipeline {
steps {
checkout scm
bat "${NANT_BIN} -buildfile:log4net.build generate-site"
- stash includes: 'target/site-deploy/**/*.*', name: 'site'
+ stash includes: 'target/site/**.*', name: 'site'
}
}
// TODO: testing needs to be refactored
@@ -148,7 +148,7 @@ pipeline {
}
post {
always {
- archive '**/*.*'
+ archive '**.*'
}
failure {
step([$class: 'Mailer', notifyEveryUnstableBuild: false, recipients: 'dev@logging.apache.org'])
[10/13] logging-log4net git commit: Jenkinsfile: removed the method
definition
Posted by dp...@apache.org.
Jenkinsfile: removed the method definition
I'm simply uncapable of understanding the syntax.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bcd2281a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bcd2281a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bcd2281a
Branch: refs/heads/develop
Commit: bcd2281a7fe6ba932af19245d855933a04e8cacb
Parents: 2d8ac6a
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:45:30 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:45:30 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bcd2281a/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 7a999fa..816c0c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@
pipeline {
options {
timeout(time: 1, unit: 'HOURS')
- buildDiscarder(logRotator(numToKeepStr: '1'))
+ buildDiscarder(logRotator(numToKeepStr: '3'))
skipDefaultCheckout()
}
agent {
@@ -30,7 +30,7 @@ pipeline {
stage('build net-4.0') {
agent { label 'Windows' }
environment {
- NANT_BIN = getPathToNAntOnWindows()
+ NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
}
steps {
checkout scm
@@ -41,7 +41,7 @@ pipeline {
stage('build net-4.0-cp') {
agent { label 'Windows' }
environment {
- NANT_BIN = getPathToNAntOnWindows()
+ NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
}
steps {
checkout scm
@@ -52,7 +52,7 @@ pipeline {
stage('build net-4.5') {
agent { label 'Windows' }
environment {
- NANT_BIN = getPathToNAntOnWindows()
+ NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
}
steps {
checkout scm
@@ -106,7 +106,7 @@ pipeline {
jdk 'JDK 1.8 (latest)'
}
environment {
- NANT_BIN = getPathToNAntOnWindows()
+ NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
}
steps {
checkout scm
@@ -118,7 +118,7 @@ pipeline {
stage('test on Windows') {
agent { label 'Windows' }
environment {
- NANT_BIN = getPathToNAntOnWindows()
+ NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
}
steps {
checkout scm
@@ -156,8 +156,3 @@ pipeline {
}
}
-// TODO: find a better way to determine nant installation path
-def getPathToNAntOnWindows() {
- 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
-}
-
[05/13] logging-log4net git commit: Jenkinsfile: fixed syntax typos
Posted by dp...@apache.org.
Jenkinsfile: fixed syntax typos
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/1704ab21
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/1704ab21
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/1704ab21
Branch: refs/heads/develop
Commit: 1704ab21f9c7e8b388654887ccccb5e9ebc161ba
Parents: 2d7af0e
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:17:46 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:17:46 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1704ab21/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index bc4cb99..cbd8323 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline {
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0"
- stash includes: 'bin/**/*.*', name 'net-4.0-assemblies'
+ stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies'
}
}
stage('build net-4.0-cp') {
@@ -50,7 +50,7 @@ pipeline {
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0-cp"
- stash includes: 'bin/**/*.*', name 'net-4.0-cp-assemblies'
+ stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies'
}
}
stage('build net-4.5') {
@@ -60,7 +60,7 @@ pipeline {
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.5"
- stash includes: 'bin/**/*.*', name 'net-4.5-assemblies'
+ stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies'
}
}
stage('build mono-2.0') {
[08/13] logging-log4net git commit: Jenkinsfile: skip default
checkout and checkout manually when needed
Posted by dp...@apache.org.
Jenkinsfile: skip default checkout and checkout manually when needed
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4e968bdd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4e968bdd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4e968bdd
Branch: refs/heads/develop
Commit: 4e968bdd79eb2330142231df798bf0315e9adf9b
Parents: 48926d6
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:33:12 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:33:12 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e968bdd/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 6b3dfce..4cc242f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,23 +20,20 @@
pipeline {
options {
timeout(time: 1, unit: 'HOURS')
+ buildDiscarder(logRotator(numToKeepStr: '1'))
+ skipDefaultCheckout()
}
agent {
label 'ubuntu'
- skipDefaultCheckout()
}
stages {
- stage('checkout') {
- steps {
- checkout scm
- }
- }
stage('build net-4.0') {
agent { label 'Windows' }
environment {
NANT_BIN = getPathToNAntOnWindows()
}
steps {
+ checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0"
stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies'
}
@@ -47,6 +44,7 @@ pipeline {
NANT_BIN = getPathToNAntOnWindows()
}
steps {
+ checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0-cp"
stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies'
}
@@ -57,6 +55,7 @@ pipeline {
NANT_BIN = getPathToNAntOnWindows()
}
steps {
+ checkout scm
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.5"
stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies'
}
@@ -69,6 +68,7 @@ pipeline {
}
}
steps {
+ checkout scm
sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
}
@@ -81,6 +81,7 @@ pipeline {
}
}
steps {
+ checkout scm
sh "nant -t:mono-3.5 -buildfile:log4net.build compile-mono-3.5"
stash includes: 'bin/**/*.*', name: 'mono-3.5-assemblies'
}
@@ -93,6 +94,7 @@ pipeline {
}
}
steps {
+ checkout scm
sh "nant -t:mono-4.0 -buildfile:log4net.build compile-mono-4.0"
stash includes: 'bin/**/*.*', name: 'mono-4.0-assemblies'
}
@@ -107,6 +109,7 @@ pipeline {
NANT_BIN = getPathToNAntOnWindows()
}
steps {
+ checkout scm
bat "${NANT_BIN} -buildfile:log4net.build generate-site"
stash includes: 'target/site-deploy/**/*.*', name: 'site'
}
@@ -118,6 +121,7 @@ pipeline {
NANT_BIN = getPathToNAntOnWindows()
}
steps {
+ checkout scm
bat "${NANT_BIN} -buildfile:tests\\nant.build"
// TODO: stash test results
}
[06/13] logging-log4net git commit: Jenkinsfile: refactored def to be
a function
Posted by dp...@apache.org.
Jenkinsfile: refactored def to be a function
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7ae5c96c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7ae5c96c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7ae5c96c
Branch: refs/heads/develop
Commit: 7ae5c96ca3b3a7c97048b9cf1e660796a25505b5
Parents: 1704ab2
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:24:57 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:24:57 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7ae5c96c/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index cbd8323..ebad3f9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,9 @@ pipeline {
skipDefaultCheckout()
}
// TODO: find a better way to determine nant installation path
- def NANT = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
+ def getPathToNAntOnWindows() {
+ return 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
+ }
stages {
stage('checkout') {
steps {
@@ -36,7 +38,7 @@ pipeline {
stage('build net-4.0') {
agent { label 'Windows' }
environment {
- NANT_BIN = NANT
+ NANT_BIN = getPathToNAntOnWindows()
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0"
@@ -46,7 +48,7 @@ pipeline {
stage('build net-4.0-cp') {
agent { label 'Windows' }
environment {
- NANT_BIN = NANT
+ NANT_BIN = getPathToNAntOnWindows()
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.0-cp"
@@ -56,7 +58,7 @@ pipeline {
stage('build net-4.5') {
agent { label 'Windows' }
environment {
- NANT_BIN = NANT
+ NANT_BIN = getPathToNAntOnWindows()
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build compile-net-4.5"
@@ -106,7 +108,7 @@ pipeline {
jdk 'JDK 1.8 (latest)'
}
environment {
- NANT_BIN = NANT
+ NANT_BIN = getPathToNAntOnWindows()
}
steps {
bat "${NANT_BIN} -buildfile:log4net.build generate-site"
@@ -117,7 +119,7 @@ pipeline {
stage('test on Windows') {
agent { label 'Windows' }
environment {
- NANT_BIN = NANT
+ NANT_BIN = getPathToNAntOnWindows()
}
steps {
bat "${NANT_BIN} -buildfile:tests\\nant.build"
[09/13] logging-log4net git commit: Jenkinsfile: removed return
statement from method definition
Posted by dp...@apache.org.
Jenkinsfile: removed return statement from method definition
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2d8ac6a5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2d8ac6a5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2d8ac6a5
Branch: refs/heads/develop
Commit: 2d8ac6a5a46f3c82e8f14de5023ebdc4b28ec101
Parents: 4e968bd
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:38:17 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:38:17 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2d8ac6a5/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 4cc242f..7a999fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -158,6 +158,6 @@ pipeline {
// TODO: find a better way to determine nant installation path
def getPathToNAntOnWindows() {
- return 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
+ 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
}
[02/13] logging-log4net git commit: builder-mono-3.5: added 2.0
reference assemblies as a dependency
Posted by dp...@apache.org.
builder-mono-3.5: added 2.0 reference assemblies as a dependency
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b50c6770
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b50c6770
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b50c6770
Branch: refs/heads/develop
Commit: b50c67702d7343c222563f71a127da574156baa7
Parents: 4c2f5f3
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 13:43:20 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 13:43:20 2017 +0200
----------------------------------------------------------------------
buildtools/docker/builder-mono-3.5/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b50c6770/buildtools/docker/builder-mono-3.5/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-3.5/Dockerfile b/buildtools/docker/builder-mono-3.5/Dockerfile
index 70ab8b9..709f0fd 100644
--- a/buildtools/docker/builder-mono-3.5/Dockerfile
+++ b/buildtools/docker/builder-mono-3.5/Dockerfile
@@ -5,5 +5,5 @@ FROM ubuntu:latest
MAINTAINER "dev@logging.apache.org"
# install nant
-RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-3.5
+RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-2.0 mono-reference-assemblies-3.5
[07/13] logging-log4net git commit: Jenkinsfile: moved method
definition to the end of the file
Posted by dp...@apache.org.
Jenkinsfile: moved method definition to the end of the file
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/48926d6c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/48926d6c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/48926d6c
Branch: refs/heads/develop
Commit: 48926d6c2c849d515798815dc3c36068cb7ccd0e
Parents: 7ae5c96
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 14:27:25 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 14:27:25 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/48926d6c/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index ebad3f9..6b3dfce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,10 +25,6 @@ pipeline {
label 'ubuntu'
skipDefaultCheckout()
}
- // TODO: find a better way to determine nant installation path
- def getPathToNAntOnWindows() {
- return 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
- }
stages {
stage('checkout') {
steps {
@@ -156,3 +152,8 @@ pipeline {
}
}
+// TODO: find a better way to determine nant installation path
+def getPathToNAntOnWindows() {
+ return 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
+}
+
[13/13] logging-log4net git commit: Jenkinsfile: transform
target/site/ to site/
Posted by dp...@apache.org.
Jenkinsfile: transform target/site/ to site/
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0ccb1e98
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0ccb1e98
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0ccb1e98
Branch: refs/heads/develop
Commit: 0ccb1e987126e4ad6f2f3dd6dba0abe39f8621d6
Parents: 83c4229
Author: Dominik Psenner <dp...@apache.org>
Authored: Mon Jul 3 15:06:52 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Mon Jul 3 15:06:52 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0ccb1e98/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 0ec4ed9..6fb9b0c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,6 +135,8 @@ pipeline {
unstash 'mono-3.5-assemblies'
unstash 'mono-4.0-assemblies'
unstash 'site'
+ sh 'mv target/site site'
+ sh 'rmdir target'
}
}
stage('deploy site') {