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 2018/05/20 15:49:24 UTC
[40/50] logging-log4net git commit: mono-2.0: change docker to be
tagged like netstandard-1.3
mono-2.0: change docker to be tagged like netstandard-1.3
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2d1c4d78
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2d1c4d78
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2d1c4d78
Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 2d1c4d78ae080283797aecea5b16229909c84e29
Parents: 26afadb
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 22:11:25 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 22:11:25 2018 +0200
----------------------------------------------------------------------
Jenkinsfile | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2d1c4d78/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index ed54f8b..4df17e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
).trim()
// build docker container
- def builder = docker.build 'builder-netstandard:latest', "--file $builder_dir/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID $builder_dir"
+ def builder = docker.build 'builder-netstandard-1.3:latest', "--file $builder_dir/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID $builder_dir"
// run docker container
builder.inside {
@@ -163,12 +163,24 @@ pipeline {
}
}
steps {
- sh "rm -rf bin/ tests/"
- checkout scm
- sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
- stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
- sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0"
- stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults'
+ script {
+ checkout scm
+ def builder_target = "mono-2.0"
+ def builder_dir = "buildtools/docker/builder-$builder_target"
+
+ // build docker container
+ def builder = docker.build 'builder-$builder_target:latest', "--file $builder_dir/Dockerfile $builder_dir"
+
+ // run docker container
+ builder.inside {
+ sh "rm -rf bin/ tests/"
+ checkout scm
+ sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
+ stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
+ sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0"
+ stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults'
+ }
+ }
}
}
stage('build mono-3.5') {