[geos-commits] [SCM] GEOS branch master updated. 8a99c2f916964a98fe60725ed7c8d0da92a1e79b

[git at osgeo.org]

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 "GEOS".

The branch, master has been updated
       via  8a99c2f916964a98fe60725ed7c8d0da92a1e79b (commit)
       via  d7b6fb3c14e18f5b356278bf7b808ab23da1658b (commit)
       via  05ef63fce384f3de76698abf50b427ac36e665cd (commit)
      from  e2057ccb8302429d979c305cbb0c453e27434c6c (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 -----------------------------------------------------------------
commit 8a99c2f916964a98fe60725ed7c8d0da92a1e79b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu May 16 16:31:28 2019 -0500

    Add geos_revision.h back to dist files

diff --git a/Makefile.am b/Makefile.am
index ee5c238..9f8991e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST = acsite.m4 .editorconfig \
 	cmake/GetGitRevision.cmake \
 	cmake/cmake_uninstall.cmake.in \
 	cmake/geos-config.cmake \
+	geos_revision.h \
 	README.md
 
 ACLOCAL_AMFLAGS = -I macros

commit d7b6fb3c14e18f5b356278bf7b808ab23da1658b
Merge: e2057cc 05ef63f
Author: Daniel Baston <dbaston at gmail.com>
Date:   Tue May 21 09:13:46 2019 -0400

    Merge remote-tracking branch 'origin/reduce-travis-matrix'


commit 05ef63fce384f3de76698abf50b427ac36e665cd
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sat May 18 22:30:35 2019 -0400

    Reduce Travis build matrix
    
    There is no need to test each compiler/architecture combination using
    both build systems. This commit uses CMake as the primary build system
    for Travis (since it is significantly faster) and includes one autotools
    build for a single compiler/architecture to verify that the autotools
    system can continue to be used.

diff --git a/.travis.yml b/.travis.yml
index 77f2a46..f02b214 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,18 +51,6 @@ matrix:
       addons:
         apt:
           sources: *sources
-          packages: ['g++-7-multilib','gcc-7-multilib','g++-multilib','gcc-multilib','ccache','git2cl']
-      env:
-        - E="TOOL=autotools && CXX=g++-7 && ARCH=-m32 && CC=gcc-7"
-
-    - os: linux
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      addons:
-        apt:
-          sources: *sources
           packages: ['g++-4.8','cmake','ccache']
       env:
         - E="TOOL=cmake && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
@@ -75,18 +63,6 @@ matrix:
       addons:
         apt:
           sources: *sources
-          packages: ['g++-4.8','ccache','git2cl']
-      env:
-        - E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
-
-    - os: linux
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      addons:
-        apt:
-          sources: *sources
           packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib','ccache','git2cl']
       env:
         - E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m32 && CC=gcc-4.8"
@@ -111,30 +87,6 @@ matrix:
       addons:
         apt:
           sources: *sources
-          packages: ['clang-3.9','ccache','git2cl']
-      env:
-        - E="TOOL=autotools && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
-
-    - os: linux
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      addons:
-        apt:
-          sources: *sources
-          packages: ['clang','ccache','git2cl']
-      env:
-        - E="TOOL=autotools && CXX=clang++ && ARCH=-m64 && CC=clang"
-
-    - os: linux
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      addons:
-        apt:
-          sources: *sources
           packages: ['clang','cmake','ccache']
       env:
         - E="TOOL=cmake && CXX=clang++ && ARCH=-m64 && CC=clang"

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

Summary of changes:
 .travis.yml | 48 ------------------------------------------------
 Makefile.am |  1 +
 2 files changed, 1 insertion(+), 48 deletions(-)


hooks/post-receive
-- 
GEOS