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/08/18 08:43:54 UTC
[06/13] logging-log4net git commit: replace nant with dotnet cli in
build-netstandard stage
replace nant with dotnet cli in build-netstandard stage
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b17cdf0f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b17cdf0f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b17cdf0f
Branch: refs/heads/feature/netstandard-2.0
Commit: b17cdf0f1a8852c15d6c740739f2ee40f026cd15
Parents: 883fa67
Author: Charles Lowell <ch...@microsoft.com>
Authored: Mon Aug 14 14:13:42 2017 -0700
Committer: Charles Lowell <ch...@microsoft.com>
Committed: Wed Aug 16 09:52:14 2017 -0700
----------------------------------------------------------------------
Jenkinsfile | 15 ++++-----------
buildtools/docker/builder-netstandard/Dockerfile | 7 +------
2 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b17cdf0f/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 43215b5..0d9386e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,21 +61,14 @@ pipeline {
// run docker container
builder.inside {
// compile
- sh "nant compile-netstandard"
+ sh "dotnet build src/log4net.csproj -c Release -f netstandard1.3 -o ../bin/netstandard1.3"
+ sh "dotnet build src/log4net.csproj -c Release -f netstandard2.0 -o ../bin/netstandard2.0"
stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
// test
- sh 'cd netstandard/log4net.tests && dotnet test'
+ sh "dotnet test tests/src/log4net.Tests.csproj"
}
}
-
-
- // compile
- // sh 'nant compile-netstandard'
- // stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
-
- // test
- // sh 'cd netstandard/log4net.tests && dotnet test'
}
}
stage('build net-3.5') {
@@ -245,7 +238,7 @@ pipeline {
// unstash site
unstash 'site'
}
-
+
// move site
sh 'mv package/target/site/ package/site/'
sh 'rmdir -p --ignore-fail-on-non-empty package/target'
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b17cdf0f/buildtools/docker/builder-netstandard/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile
index 2dc5f54..4834253 100644
--- a/buildtools/docker/builder-netstandard/Dockerfile
+++ b/buildtools/docker/builder-netstandard/Dockerfile
@@ -1,5 +1,4 @@
-# Name of container: docker-ubuntu-latest-nant
-FROM microsoft/dotnet
+FROM microsoft/dotnet:2.0.0-sdk-stretch
# define arguments passed in as environment variables
ARG JENKINS_UID
@@ -17,7 +16,3 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces
# add jenkins user that maps to the custom workspace
RUN groupadd -r -g $JENKINS_GID jenkins-slave
RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JENKINS_UID --gid $JENKINS_GID --groups $JENKINS_GID -p -M jenkins
-
-# install dependencies
-RUN apt-get update && apt-get install -y nant git
-