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/23 19:23:19 UTC
[1/5] logging-log4net git commit: Jenkinsfile: moved the dotnet test
command to the tests/nant.build file
Repository: logging-log4net
Updated Branches:
refs/heads/feature/netstandard-2.0 fa9103f9f -> c027a5e7b
Jenkinsfile: moved the dotnet test command to the tests/nant.build 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/9ec245cd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9ec245cd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9ec245cd
Branch: refs/heads/feature/netstandard-2.0
Commit: 9ec245cdf2fe34e408f59db601909dec84a91d13
Parents: 1db460b
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun Aug 20 22:41:31 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun Aug 20 22:41:31 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 4 +++-
tests/nant.build | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9ec245cd/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index a13b52b..810f702 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,8 @@ pipeline {
stash includes: 'bin/**/*.*', name: 'netstandard-1.3-assemblies'
// test
- sh 'cd netstandard/log4net.tests && dotnet test --verbosity detailed'
+ bat "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
+ stash includes: 'tests/bin/**/*.nunit.xml', name: 'netstandard-1.3-testresults'
}
}
}
@@ -231,6 +232,7 @@ pipeline {
unstash 'mono-2.0-testresults'
unstash 'mono-3.5-testresults'
unstash 'mono-4.0-testresults'
+ unstash 'netstandard-1.3-testresults'
// unstash site
unstash 'site'
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9ec245cd/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index d18b3d1..75b37fe 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -865,4 +865,12 @@ limitations under the License.
</nunit2>
</target>
+ <target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
+ <exec program="dotnet" workingdir="netstandard/log4net.tests">
+ <arg value="test"/>
+ <arg value="--verbosity"/>
+ <arg value="detailed"/>
+ </exec>
+ </target>
+
</project>
[2/5] logging-log4net git commit: Jenkinsfile: fixed typo
Posted by dp...@apache.org.
Jenkinsfile: fixed typo
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/e920c98c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/e920c98c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/e920c98c
Branch: refs/heads/feature/netstandard-2.0
Commit: e920c98cf8fbff41bfa4c3098ef67e37c6b94165
Parents: 9ec245c
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun Aug 20 22:45:47 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun Aug 20 22:45:47 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e920c98c/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 810f702..d9d877e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,7 @@ pipeline {
stash includes: 'bin/**/*.*', name: 'netstandard-1.3-assemblies'
// test
- bat "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
+ sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
stash includes: 'tests/bin/**/*.nunit.xml', name: 'netstandard-1.3-testresults'
}
}
[4/5] logging-log4net git commit: Merge remote-tracking branch
'feature/cd-pipeline' into feature/netstandard-2.0
Posted by dp...@apache.org.
Merge remote-tracking branch 'feature/cd-pipeline' into feature/netstandard-2.0
# Conflicts:
# Jenkinsfile
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7799f5a4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7799f5a4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7799f5a4
Branch: refs/heads/feature/netstandard-2.0
Commit: 7799f5a420ba9637f0ee0e1801d1e9b7a4d2028a
Parents: fa9103f fec14bf
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Aug 22 18:22:18 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Aug 22 18:22:18 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 6 ++++--
tests/nant.build | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7799f5a4/Jenkinsfile
----------------------------------------------------------------------
[5/5] logging-log4net git commit: Jenkinsfile: expect a mstests.xml
to be generated by the target runtests-netstandard-1.3
Posted by dp...@apache.org.
Jenkinsfile: expect a mstests.xml to be generated by the target runtests-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/c027a5e7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c027a5e7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c027a5e7
Branch: refs/heads/feature/netstandard-2.0
Commit: c027a5e7b9464042cea15d5681fedcf8273ac132
Parents: 7799f5a
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed Aug 23 21:23:00 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed Aug 23 21:23:00 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c027a5e7/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index d391cb1..6091ff0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,7 +64,7 @@ pipeline {
// test
sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
- stash includes: 'tests/bin/**/*.nunit.xml', name: 'netstandard-1.3-testresults'
+ stash includes: 'tests/bin/**/*.mstests.xml', name: 'netstandard-1.3-testresults'
}
}
}
[3/5] logging-log4net git commit: tests-netstandard-1.3: added
log4net basedir to the workingdir where dotnet test is invoked
Posted by dp...@apache.org.
tests-netstandard-1.3: added log4net basedir to the workingdir where dotnet test is invoked
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fec14bfd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fec14bfd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fec14bfd
Branch: refs/heads/feature/netstandard-2.0
Commit: fec14bfd7a5ff46306b9e7544deac242c085bd7d
Parents: e920c98
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun Aug 20 22:53:54 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun Aug 20 22:53:54 2017 +0200
----------------------------------------------------------------------
tests/nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fec14bfd/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 75b37fe..815ead1 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -866,7 +866,7 @@ limitations under the License.
</target>
<target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
- <exec program="dotnet" workingdir="netstandard/log4net.tests">
+ <exec program="dotnet" workingdir="${log4net.basedir}/netstandard/log4net.tests">
<arg value="test"/>
<arg value="--verbosity"/>
<arg value="detailed"/>