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/19 08:41:16 UTC
[1/6] logging-log4net git commit: builder-netstandard: added nant apt
package source
Repository: logging-log4net
Updated Branches:
refs/heads/feature/cd-pipeline c7cf31f82 -> ebfc7f507
builder-netstandard: added nant apt package source
The package source points to sid, thus allowing nant to be installed
in debian stretch too.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/be2ae993
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/be2ae993
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/be2ae993
Branch: refs/heads/feature/cd-pipeline
Commit: be2ae993df503bb563513d8637eb45b4fba16144
Parents: c7cf31f
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:03:21 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:03:21 2017 +0200
----------------------------------------------------------------------
buildtools/docker/builder-netstandard/Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/be2ae993/buildtools/docker/builder-netstandard/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile
index 2dc5f54..2e7a109 100644
--- a/buildtools/docker/builder-netstandard/Dockerfile
+++ b/buildtools/docker/builder-netstandard/Dockerfile
@@ -18,6 +18,10 @@ RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces
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
+# HACK: add apt source to make nant available;
+# the docker image is now based on debian stretch which no longer includes the nant package
+echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list
+
# install dependencies
RUN apt-get update && apt-get install -y nant git
[2/6] logging-log4net git commit: Jenkinsfile: removed comments and
debug outputs
Posted by dp...@apache.org.
Jenkinsfile: removed comments and debug outputs
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bab915d4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bab915d4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bab915d4
Branch: refs/heads/feature/cd-pipeline
Commit: bab915d40c3813594f535ba61b56bbcbb9cbe5c1
Parents: be2ae99
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:08:40 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:08:40 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bab915d4/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 43215b5..826bc17 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,8 +52,6 @@ pipeline {
script: "stat -c \"%g\" $builder_dir",
returnStdout: true
).trim()
- echo "$JENKINS_UID"
- echo "$JENKINS_GID"
// 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"
@@ -68,14 +66,6 @@ pipeline {
sh 'cd netstandard/log4net.tests && dotnet test'
}
}
-
-
- // 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 +235,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'
[3/6] logging-log4net git commit: builder-netstandard: removed debug
outputs
Posted by dp...@apache.org.
builder-netstandard: removed debug outputs
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/276eb816
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/276eb816
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/276eb816
Branch: refs/heads/feature/cd-pipeline
Commit: 276eb81608f0a7647019871fc3fe3c6a15fa82e0
Parents: bab915d
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:09:07 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:09:07 2017 +0200
----------------------------------------------------------------------
buildtools/docker/builder-netstandard/Dockerfile | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/276eb816/buildtools/docker/builder-netstandard/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile
index 2e7a109..7cde122 100644
--- a/buildtools/docker/builder-netstandard/Dockerfile
+++ b/buildtools/docker/builder-netstandard/Dockerfile
@@ -8,9 +8,6 @@ ARG JENKINS_GID
# set the maintainer of this docker image
MAINTAINER "dev@logging.apache.org"
-RUN echo $JENKINS_UID
-RUN echo $JENKINS_GID
-
# add custom workspace that can be written by anyone
RUN mkdir -p /var/workspaces && chmod 0777 /var/workspaces
[5/6] logging-log4net git commit: Jenkinsfile: fixed stash command to
mention netstandard-1.3 too
Posted by dp...@apache.org.
Jenkinsfile: fixed stash command to mention netstandard-1.3 too
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/652b9cb1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/652b9cb1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/652b9cb1
Branch: refs/heads/feature/cd-pipeline
Commit: 652b9cb1571dd75b4966ee217a1bcfddd5e3f026
Parents: 38465f7
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:27:04 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:27:04 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/652b9cb1/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index b988843..7212610 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
builder.inside {
// compile
sh "nant compile-netstandard-1.3"
- stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
+ stash includes: 'bin/**/*.*', name: 'netstandard-1.3-assemblies'
// test
sh 'cd netstandard/log4net.tests && dotnet test'
@@ -220,7 +220,7 @@ pipeline {
unstash 'mono-2.0-assemblies'
unstash 'mono-3.5-assemblies'
unstash 'mono-4.0-assemblies'
- unstash 'netstandard-assemblies'
+ unstash 'netstandard-1.3-assemblies'
// unstash test results
unstash 'net-3.5-testresults'
[4/6] logging-log4net git commit: build: refactored netstandard
target to mention 1.3
Posted by dp...@apache.org.
build: refactored netstandard target to mention 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/38465f7a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/38465f7a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/38465f7a
Branch: refs/heads/feature/cd-pipeline
Commit: 38465f7a478103b952dcea5753d9dcfb33ece5d4
Parents: 276eb81
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:19:12 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:21:39 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
log4net.build | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/38465f7a/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 826bc17..b988843 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
// run docker container
builder.inside {
// compile
- sh "nant compile-netstandard"
+ sh "nant compile-netstandard-1.3"
stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
// test
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/38465f7a/log4net.build
----------------------------------------------------------------------
diff --git a/log4net.build b/log4net.build
index 6961d8b..f08133f 100644
--- a/log4net.build
+++ b/log4net.build
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
+Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
+this work for additional information regarding copyright ownership.
The ASF licenses this file to you under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -201,8 +201,8 @@ limitations under the License.
<call target="compile-mono-4.0"/>
<!-- SSCLI_1_0 -->
<call target="compile-sscli-1.0"/>
- <!-- netstandard -->
- <call target="compile-netstandard"/>
+ <!-- netstandard-1.3 -->
+ <call target="compile-netstandard-1.3"/>
</target>
<!-- Target for compiling all build configurations for the current runtime configurations -->
<target name="compile-runtime" description="Compile all build configurations for the current target framework">
@@ -1748,14 +1748,14 @@ limitations under the License.
</csc>
</if>
</target>
- <!-- these targets build lognet assemblies against .NET Core (.net standard 1.0.4)-->
- <target name="compile-netstandard" description="Builds .NET Core">
+ <!-- these targets build lognet assemblies against .NET Core (.net standard 1.3)-->
+ <target name="compile-netstandard-1.3" description="Builds .NET Core">
<call target="set-debug-build-configuration"/>
- <call target="compile-netstandard-current-configuration"/>
+ <call target="compile-netstandard-1.3-current-configuration"/>
<call target="set-release-build-configuration"/>
- <call target="compile-netstandard-current-configuration"/>
+ <call target="compile-netstandard-1.3-current-configuration"/>
</target>
- <target name="compile-netstandard-current-configuration">
+ <target name="compile-netstandard-1.3-current-configuration">
<echo message="dotnet --version"/>
<exec program="dotnet" workingdir="netstandard" failonerror="false" resultproperty="dotnet.available">
<arg value="--version"/>
[6/6] logging-log4net git commit: builder-netstandard: fixed typo
Posted by dp...@apache.org.
builder-netstandard: 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/ebfc7f50
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ebfc7f50
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ebfc7f50
Branch: refs/heads/feature/cd-pipeline
Commit: ebfc7f507a61fdd8f6a4f1e90cbcccc5a40515cf
Parents: 652b9cb
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:39:39 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:39:39 2017 +0200
----------------------------------------------------------------------
buildtools/docker/builder-netstandard/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ebfc7f50/buildtools/docker/builder-netstandard/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile
index 7cde122..b9c5f31 100644
--- a/buildtools/docker/builder-netstandard/Dockerfile
+++ b/buildtools/docker/builder-netstandard/Dockerfile
@@ -17,7 +17,7 @@ RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JE
# HACK: add apt source to make nant available;
# the docker image is now based on debian stretch which no longer includes the nant package
-echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list
+RUN echo "deb http://ftp.de.debian.org/debian sid main" >> /etc/apt/sources.list
# install dependencies
RUN apt-get update && apt-get install -y nant git