[grisbi-cvs] [git push]Grisbi branch master updated. upstream_version_1_0_0-390-g21ead6f

[Ludovic Rousseau]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grisbi".

The branch, master has been updated
       via  21ead6f4d88b38cd706338c6f17dcc972c3c2497 (commit)
      from  22b1e574748545c446f4953e0f459a10ebcc7b40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=

commit 21ead6f4d88b38cd706338c6f17dcc972c3c2497
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Wed Oct 5 15:27:12 2016 +0200

    Travis-CI: rework the Docker instructions
    
    Travis-CI (using Docker) should now work also for push requests.

diff --git a/.travis.yml b/.travis.yml
index 674463e..3de36c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,18 @@ sudo: required
 language: c
 
 services:
-    - docker
+  - docker
+
+env:
+  - DIST_NAME: debian
+    DIST_VERS: testing
+    TAG: grisbi
+
+before_install:
+    - docker pull ${DIST_NAME}:${DIST_VERS}
+    - docker build --rm=true --file=travis-ci/Dockerfile.${DIST_NAME}-${DIST_VERS} --tag=${DIST_NAME}-${DIST_VERS}:${TAG} travis-ci
 
 script:
-    - docker pull ubuntu:16.04
-    - docker run ubuntu:16.04 /bin/sh -c "apt-get update ; apt-get install autoconf automake libtool-bin m4 intltool libgtk-3-dev libgsf-1-dev libgoffice-0.10-dev git build-essential -y ; cd /root ; git clone --depth=50 --branch=master https://github.com/grisbi/grisbi.git ; cd grisbi ; ./travis-autogen.sh ; make"
+    - docker run --volume=`pwd`:/build ${DIST_NAME}-${DIST_VERS}:${TAG}
+      /bin/sh -c "./travis-ci/travis-autogen.sh ; make"
 
diff --git a/travis-ci/Dockerfile.debian-testing b/travis-ci/Dockerfile.debian-testing
new file mode 100644
index 0000000..a4627f4
--- /dev/null
+++ b/travis-ci/Dockerfile.debian-testing
@@ -0,0 +1,18 @@
+FROM debian:testing
+MAINTAINER Ludovic Rousseau
+
+RUN apt-get -y update \
+	&& apt-get install -y \
+		autoconf \
+		automake \
+		build-essential \
+		intltool \
+		libgoffice-0.10-dev \
+		libgsf-1-dev \
+		libgtk-3-dev \
+		libtool-bin \
+		m4 \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /build
+WORKDIR /build
diff --git a/travis-autogen.sh b/travis-ci/travis-autogen.sh
similarity index 97%
rename from travis-autogen.sh
rename to travis-ci/travis-autogen.sh
index 2215ed8..5fa7a36 100755
--- a/travis-autogen.sh
+++ b/travis-ci/travis-autogen.sh
@@ -37,5 +37,5 @@ CFLAGS+=" -Wno-unused-parameter"
 
 export CFLAGS
 
-./autogen.sh
+sh -x ./autogen.sh
 ./configure

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml                                      |   15 ++++++++++++---
 travis-ci/Dockerfile.debian-testing              |   18 ++++++++++++++++++
 travis-autogen.sh => travis-ci/travis-autogen.sh |    2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 travis-ci/Dockerfile.debian-testing
 rename travis-autogen.sh => travis-ci/travis-autogen.sh (97%)


hooks/post-receive
-- 
Grisbi