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 16:15:07 UTC
[01/12] logging-log4net git commit: builder-netstandard: added nant
apt package source
Repository: logging-log4net
Updated Branches:
refs/heads/feature/netstandard-2.0 e666d9ea6 -> 8a43f89bb
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/netstandard-2.0
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
[03/12] 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/netstandard-2.0
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
[08/12] logging-log4net git commit: builder-netstandard: base docker
image on 1.1.2-sdk-jessie
Posted by dp...@apache.org.
builder-netstandard: base docker image on 1.1.2-sdk-jessie
nant is available in jessie and we do not have to apply a hack.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fb4d9901
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fb4d9901
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fb4d9901
Branch: refs/heads/feature/netstandard-2.0
Commit: fb4d9901e039dd76cbeaedb284073eef43b2b231
Parents: 4c4a5c9
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:53:46 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:53:46 2017 +0200
----------------------------------------------------------------------
buildtools/docker/builder-netstandard/Dockerfile | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fb4d9901/buildtools/docker/builder-netstandard/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile
index b9c5f31..6fd683a 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:1.1.2-sdk-jessie
# define arguments passed in as environment variables
ARG JENKINS_UID
@@ -15,10 +14,6 @@ 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
-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
[09/12] logging-log4net git commit: builder-netstandard: renamed the
builder to mention version 1.3
Posted by dp...@apache.org.
builder-netstandard: renamed the builder to mention version 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/5edf53ae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5edf53ae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5edf53ae
Branch: refs/heads/feature/netstandard-2.0
Commit: 5edf53ae675164d8b98f7c30f3f67ac2861b2e36
Parents: fb4d990
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 11:05:47 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 11:05:47 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
.../docker/build-builder-netstandard-1.3.sh | 23 ++++++++++++++++++++
buildtools/docker/build-builder-netstandard.sh | 23 --------------------
.../docker/builder-netstandard-1.3/Dockerfile | 19 ++++++++++++++++
.../docker/builder-netstandard/Dockerfile | 19 ----------------
.../docker/run-builder-netstandard-1.3.sh | 18 +++++++++++++++
buildtools/docker/run-builder-netstandard.sh | 18 ---------------
7 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 0a8fbe6..34cb27a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
steps {
script {
checkout scm
- def builder_dir = "buildtools/docker/builder-netstandard"
+ def builder_dir = "buildtools/docker/builder-netstandard-1.3"
// calculate args required to build the docker container
def JENKINS_UID = sh (
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/build-builder-netstandard-1.3.sh
----------------------------------------------------------------------
diff --git a/buildtools/docker/build-builder-netstandard-1.3.sh b/buildtools/docker/build-builder-netstandard-1.3.sh
new file mode 100755
index 0000000..f1fc772
--- /dev/null
+++ b/buildtools/docker/build-builder-netstandard-1.3.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+MY_PATH="`dirname \"$0\"`" # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
+if [ -z "$MY_PATH" ] ; then
+ # error; for some reason, the path is not accessible
+ # to the script (e.g. permissions re-evaled after suid)
+ exit 1 # fail
+fi
+
+NAME="builder-netstandard-1.3"
+JENKINS_UID=$2
+if [ -z "$JENKINS_UID" ] ; then
+ JENKINS_UID="`stat -c \"%u\" $0`"
+fi
+
+JENKINS_GID=$3
+if [ -z "$JENKINS_GID" ] ; then
+ JENKINS_GID="`stat -c \"%g\" $0`"
+fi
+
+docker build --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID --tag $NAME:latest $MY_PATH/$NAME
+
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/build-builder-netstandard.sh
----------------------------------------------------------------------
diff --git a/buildtools/docker/build-builder-netstandard.sh b/buildtools/docker/build-builder-netstandard.sh
deleted file mode 100755
index e3871c5..0000000
--- a/buildtools/docker/build-builder-netstandard.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-MY_PATH="`dirname \"$0\"`" # relative
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
-if [ -z "$MY_PATH" ] ; then
- # error; for some reason, the path is not accessible
- # to the script (e.g. permissions re-evaled after suid)
- exit 1 # fail
-fi
-
-NAME="builder-netstandard"
-JENKINS_UID=$2
-if [ -z "$JENKINS_UID" ] ; then
- JENKINS_UID="`stat -c \"%u\" $0`"
-fi
-
-JENKINS_GID=$3
-if [ -z "$JENKINS_GID" ] ; then
- JENKINS_GID="`stat -c \"%g\" $0`"
-fi
-
-docker build --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID --tag $NAME:latest $MY_PATH/$NAME
-
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/builder-netstandard-1.3/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard-1.3/Dockerfile b/buildtools/docker/builder-netstandard-1.3/Dockerfile
new file mode 100644
index 0000000..6fd683a
--- /dev/null
+++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile
@@ -0,0 +1,19 @@
+FROM microsoft/dotnet:1.1.2-sdk-jessie
+
+# define arguments passed in as environment variables
+ARG JENKINS_UID
+ARG JENKINS_GID
+
+# set the maintainer of this docker image
+MAINTAINER "dev@logging.apache.org"
+
+# add custom workspace that can be written by anyone
+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
+
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/builder-netstandard/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard/Dockerfile b/buildtools/docker/builder-netstandard/Dockerfile
deleted file mode 100644
index 6fd683a..0000000
--- a/buildtools/docker/builder-netstandard/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM microsoft/dotnet:1.1.2-sdk-jessie
-
-# define arguments passed in as environment variables
-ARG JENKINS_UID
-ARG JENKINS_GID
-
-# set the maintainer of this docker image
-MAINTAINER "dev@logging.apache.org"
-
-# add custom workspace that can be written by anyone
-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
-
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/run-builder-netstandard-1.3.sh
----------------------------------------------------------------------
diff --git a/buildtools/docker/run-builder-netstandard-1.3.sh b/buildtools/docker/run-builder-netstandard-1.3.sh
new file mode 100755
index 0000000..f97f54b
--- /dev/null
+++ b/buildtools/docker/run-builder-netstandard-1.3.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+MY_PATH="`dirname \"$0\"`" # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
+if [ -z "$MY_PATH" ] ; then
+ # error; for some reason, the path is not accessible
+ # to the script (e.g. permissions re-evaled after suid)
+ echo "Path is not accessible to the script"
+ exit 1 # fail
+fi
+
+WORKING_DIR="$1"
+if [ -z "$WORKING_DIR" ]; then
+ WORKING_DIR=$(pwd)
+fi
+
+$MY_PATH/run.sh "builder-netstandard-1.3" $WORKING_DIR
+
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5edf53ae/buildtools/docker/run-builder-netstandard.sh
----------------------------------------------------------------------
diff --git a/buildtools/docker/run-builder-netstandard.sh b/buildtools/docker/run-builder-netstandard.sh
deleted file mode 100755
index e3d2794..0000000
--- a/buildtools/docker/run-builder-netstandard.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-MY_PATH="`dirname \"$0\"`" # relative
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
-if [ -z "$MY_PATH" ] ; then
- # error; for some reason, the path is not accessible
- # to the script (e.g. permissions re-evaled after suid)
- echo "Path is not accessible to the script"
- exit 1 # fail
-fi
-
-WORKING_DIR="$1"
-if [ -z "$WORKING_DIR" ]; then
- WORKING_DIR=$(pwd)
-fi
-
-$MY_PATH/run.sh "builder-netstandard" $WORKING_DIR
-
[10/12] logging-log4net git commit: Jenkinsfile: let dotnet test
verbosity be detailed
Posted by dp...@apache.org.
Jenkinsfile: let dotnet test verbosity be detailed
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/13e136fb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/13e136fb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/13e136fb
Branch: refs/heads/feature/netstandard-2.0
Commit: 13e136fba5e353068935c40acb0c1025db47ca16
Parents: 5edf53a
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 12:21:35 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 12:21:35 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/13e136fb/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 34cb27a..e6f2224 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,7 @@ pipeline {
stash includes: 'bin/**/*.*', name: 'netstandard-1.3-assemblies'
// test
- sh 'cd netstandard/log4net.tests && dotnet test'
+ sh 'cd netstandard/log4net.tests && dotnet test --verbosity detailed'
}
}
}
[05/12] 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/netstandard-2.0
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'
[11/12] logging-log4net git commit: Jenkinsfile: increased timeout to
4 hours
Posted by dp...@apache.org.
Jenkinsfile: increased timeout to 4 hours
Building the docker containers takes a significant amount of time.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/1db460bd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/1db460bd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/1db460bd
Branch: refs/heads/feature/netstandard-2.0
Commit: 1db460bd9db1cfae308fdd18da8c40596bf10939
Parents: 13e136f
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 13:10:06 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 13:10:06 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1db460bd/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index e6f2224..a13b52b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@
pipeline {
options {
- timeout(time: 1, unit: 'HOURS')
+ timeout(time: 4, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '3'))
skipDefaultCheckout()
disableConcurrentBuilds()
[06/12] 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/netstandard-2.0
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
[02/12] 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/netstandard-2.0
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'
[12/12] logging-log4net git commit: Merge branch 'develop' into
feature/netstandard-2.0
Posted by dp...@apache.org.
Merge branch 'develop' into feature/netstandard-2.0
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/8a43f89b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/8a43f89b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/8a43f89b
Branch: refs/heads/feature/netstandard-2.0
Commit: 8a43f89bb1867f3c68b618ab2b3f50126fa090d7
Parents: e666d9e 1db460b
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 18:14:40 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 18:14:40 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 16 ++++++--------
.../docker/build-builder-netstandard-1.3.sh | 23 ++++++++++++++++++++
.../docker/build-builder-netstandard-2.0.sh | 23 ++++++++++++++++++++
buildtools/docker/build-builder-netstandard.sh | 23 --------------------
.../docker/builder-netstandard-1.3/Dockerfile | 18 +++++++++++++++
.../docker/builder-netstandard-2.0/Dockerfile | 18 +++++++++++++++
.../docker/builder-netstandard/Dockerfile | 18 ---------------
.../docker/run-builder-netstandard-1.3.sh | 18 +++++++++++++++
.../docker/run-builder-netstandard-2.0.sh | 18 +++++++++++++++
buildtools/docker/run-builder-netstandard.sh | 18 ---------------
log4net.build | 20 ++++++++---------
11 files changed, 135 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a43f89b/Jenkinsfile
----------------------------------------------------------------------
diff --cc Jenkinsfile
index 3f6f1b9,a13b52b..2604347
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -65,40 -63,7 +63,40 @@@ pipeline
stash includes: 'bin/**/*.*', name: 'netstandard-1.3-assemblies'
// test
- sh "dotnet test tests/src/log4net.Tests.csproj"
- sh 'cd netstandard/log4net.tests && dotnet test --verbosity detailed'
++ sh "dotnet test tests/src/log4net.Tests.csproj --verbosity detailed"
+ }
+ }
+ }
+ }
+ stage('build netstandard-2.0') {
+ steps {
+ script {
+ checkout scm
- def builder_dir = "buildtools/docker/builder-netstandard"
++ def builder_dir = "buildtools/docker/builder-netstandard-2.0"
+
+ // calculate args required to build the docker container
+ def JENKINS_UID = sh (
+ script: "stat -c \"%u\" $builder_dir",
+ returnStdout: true
+ ).trim()
+ def JENKINS_GID = sh (
+ 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"
+
+ // run docker container
+ builder.inside {
+ // compile
- sh "dotnet build src/log4net.csproj -c Release -f netstandard2.0 -o ../bin/netstandard2.0"
++ sh "nant compile-netstandard-2.0"
+ stash includes: 'bin/**/*.*', name: 'netstandard-2.0-assemblies'
+
+ // test
- sh "dotnet test tests/src/log4net.Tests.csproj"
++ sh "dotnet test tests/src/log4net.Tests.csproj --verbosity detailed"
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a43f89b/buildtools/docker/build-builder-netstandard-2.0.sh
----------------------------------------------------------------------
diff --cc buildtools/docker/build-builder-netstandard-2.0.sh
index 0000000,0000000..4839ae9
new file mode 100755
--- /dev/null
+++ b/buildtools/docker/build-builder-netstandard-2.0.sh
@@@ -1,0 -1,0 +1,23 @@@
++#!/bin/bash
++
++MY_PATH="`dirname \"$0\"`" # relative
++MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
++if [ -z "$MY_PATH" ] ; then
++ # error; for some reason, the path is not accessible
++ # to the script (e.g. permissions re-evaled after suid)
++ exit 1 # fail
++fi
++
++NAME="builder-netstandard-2.0"
++JENKINS_UID=$2
++if [ -z "$JENKINS_UID" ] ; then
++ JENKINS_UID="`stat -c \"%u\" $0`"
++fi
++
++JENKINS_GID=$3
++if [ -z "$JENKINS_GID" ] ; then
++ JENKINS_GID="`stat -c \"%g\" $0`"
++fi
++
++docker build --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID --tag $NAME:latest $MY_PATH/$NAME
++
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a43f89b/buildtools/docker/builder-netstandard-1.3/Dockerfile
----------------------------------------------------------------------
diff --cc buildtools/docker/builder-netstandard-1.3/Dockerfile
index 0000000,6fd683a..9a6851a
mode 000000,100644..100644
--- a/buildtools/docker/builder-netstandard-1.3/Dockerfile
+++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile
@@@ -1,0 -1,19 +1,18 @@@
+ FROM microsoft/dotnet:1.1.2-sdk-jessie
+
+ # define arguments passed in as environment variables
+ ARG JENKINS_UID
+ ARG JENKINS_GID
+
+ # set the maintainer of this docker image
+ MAINTAINER "dev@logging.apache.org"
+
+ # add custom workspace that can be written by anyone
+ 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
-
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a43f89b/buildtools/docker/builder-netstandard-2.0/Dockerfile
----------------------------------------------------------------------
diff --cc buildtools/docker/builder-netstandard-2.0/Dockerfile
index 0000000,0000000..7351592
new file mode 100644
--- /dev/null
+++ b/buildtools/docker/builder-netstandard-2.0/Dockerfile
@@@ -1,0 -1,0 +1,18 @@@
++FROM microsoft/dotnet:2.0-sdk-jessie
++
++# define arguments passed in as environment variables
++ARG JENKINS_UID
++ARG JENKINS_GID
++
++# set the maintainer of this docker image
++MAINTAINER "dev@logging.apache.org"
++
++# add custom workspace that can be written by anyone
++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
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a43f89b/buildtools/docker/run-builder-netstandard-2.0.sh
----------------------------------------------------------------------
diff --cc buildtools/docker/run-builder-netstandard-2.0.sh
index 0000000,0000000..25f8086
new file mode 100755
--- /dev/null
+++ b/buildtools/docker/run-builder-netstandard-2.0.sh
@@@ -1,0 -1,0 +1,18 @@@
++#!/bin/bash
++
++MY_PATH="`dirname \"$0\"`" # relative
++MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
++if [ -z "$MY_PATH" ] ; then
++ # error; for some reason, the path is not accessible
++ # to the script (e.g. permissions re-evaled after suid)
++ echo "Path is not accessible to the script"
++ exit 1 # fail
++fi
++
++WORKING_DIR="$1"
++if [ -z "$WORKING_DIR" ]; then
++ WORKING_DIR=$(pwd)
++fi
++
++$MY_PATH/run.sh "builder-netstandard-2.0" $WORKING_DIR
++
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a43f89b/log4net.build
----------------------------------------------------------------------
diff --cc log4net.build
index d491706,f08133f..08997d1
--- a/log4net.build
+++ b/log4net.build
@@@ -1748,16 -1748,16 +1748,16 @@@ limitations under the License
</csc>
</if>
</target>
- <!-- these targets build lognet assemblies against .NET Standard 1.3 and 2.0 -->
- <target name="compile-netstandard-1.3" description="Builds .NET Standard 1.3">
- <!-- these targets build lognet assemblies against .NET Core (.net standard 1.3)-->
++ <!-- these targets build lognet assemblies against .NET Standard 1.3 -->
+ <target name="compile-netstandard-1.3" description="Builds .NET Core">
<call target="set-debug-build-configuration"/>
- <call target="compile-netstandard1.3-current-configuration"/>
+ <call target="compile-netstandard-1.3-current-configuration"/>
<call target="set-release-build-configuration"/>
- <call target="compile-netstandard1.3-current-configuration"/>
+ <call target="compile-netstandard-1.3-current-configuration"/>
</target>
- <target name="compile-netstandard1.3-current-configuration">
+ <target name="compile-netstandard-1.3-current-configuration">
<echo message="dotnet --version"/>
- <exec program="dotnet" workingdir="netstandard" failonerror="false" resultproperty="dotnet.available">
+ <exec program="dotnet" workingdir="${log4net.basedir}" failonerror="false" resultproperty="dotnet.available">
<arg value="--version"/>
</exec>
<if test="${dotnet.available != '0'}">
@@@ -1786,49 -1789,7 +1786,49 @@@
</if>
<ifnot test="${current.build.config.release}">
<move todir="${log4net.basedir}/bin/netstandard/1.3/debug">
- <fileset basedir="netstandard/log4net/bin/Debug/netstandard1.3"/>
+ <fileset basedir="${log4net.basedir}/src/bin/Debug/netstandard1.3"/>
+ </move>
+ </ifnot>
+ </if>
+ </target>
+ <target name="compile-netstandard-2.0" description="Builds .NET Standard 2.0">
+ <call target="set-debug-build-configuration"/>
- <call target="compile-netstandard2.0-current-configuration"/>
++ <call target="compile-netstandard-2.0-current-configuration"/>
+ <call target="set-release-build-configuration"/>
- <call target="compile-netstandard2.0-current-configuration"/>
++ <call target="compile-netstandard-2.0-current-configuration"/>
+ </target>
- <target name="compile-netstandard2.0-current-configuration">
++ <target name="compile-netstandard-2.0-current-configuration">
+ <echo message="dotnet --version"/>
+ <exec program="dotnet" workingdir="${log4net.basedir}" failonerror="false" resultproperty="dotnet.available">
+ <arg value="--version"/>
+ </exec>
+ <if test="${dotnet.available != '0'}">
+ <echo message="Skipping build; required framework is not available: netstandard"/>
+ </if>
+ <if test="${dotnet.available == '0'}">
+ <if test="${current.build.config.release != '-c'}">
+ <echo message="dotnet build log4net.csproj"/>
+ </if>
+ <if test="${current.build.config.release == '-c'}">
+ <echo message="dotnet build log4net.csproj -c Release"/>
+ </if>
+ <exec program="dotnet" workingdir="${log4net.basedir}/src">
+ <arg value="build"/>
+ <arg value="log4net.csproj"/>
+ <arg value="-f"/>
+ <arg value="netstandard2.0"/>
+ <arg if="${current.build.config.release}" value="-c"/>
+ <arg if="${current.build.config.release}" value="Release"/>
+ </exec>
+ <mkdir dir="${log4net.basedir}/bin/netstandard/2.0"/>
+ <if test="${current.build.config.release}">
+ <move todir="${log4net.basedir}/bin/netstandard/2.0/release">
+ <fileset basedir="${log4net.basedir}/src/bin/Release/netstandard2.0"/>
+ </move>
+ </if>
+ <ifnot test="${current.build.config.release}">
+ <move todir="${log4net.basedir}/bin/netstandard/2.0/debug">
+ <fileset basedir="${log4net.basedir}/src/bin/Debug/netstandard2.0"/>
</move>
</ifnot>
</if>
[07/12] logging-log4net git commit: Jenkinsfile: renamed stage "build
netstandard" to "build netstandard-1.3"
Posted by dp...@apache.org.
Jenkinsfile: renamed stage "build netstandard" to "build 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/4c4a5c92
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4c4a5c92
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4c4a5c92
Branch: refs/heads/feature/netstandard-2.0
Commit: 4c4a5c92b34104386ec2d0e1a53b0923158ee6b5
Parents: ebfc7f5
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:43:25 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:43:25 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4c4a5c92/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 7212610..0a8fbe6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
}
// builds
- stage('build netstandard') {
+ stage('build netstandard-1.3') {
steps {
script {
checkout scm
[04/12] 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/netstandard-2.0
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"/>