[geos-commits] r4070 - in branches/3.4: . tools/ci

[svn_geos at osgeo.org]

Author: mloskot
Date: 2015-08-05 08:33:25 -0700 (Wed, 05 Aug 2015)
New Revision: 4070

Removed:
   branches/3.4/tools/ci/before_install.sh
   branches/3.4/tools/ci/before_install_autotools.sh
   branches/3.4/tools/ci/before_install_cmake.sh
Modified:
   branches/3.4/
   branches/3.4/.travis.yml
Log:
Merged revision(s) 4068-4069 from trunk:
First stab at migrating travis builds to container architecture (#739)
Delete scripts no longer used in container-based Travis CI



Property changes on: branches/3.4
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3981,4054,4062-4064
   + /trunk:3981,4054,4062-4064,4068-4069

Modified: branches/3.4/.travis.yml
===================================================================
--- branches/3.4/.travis.yml	2015-08-05 14:37:06 UTC (rev 4069)
+++ branches/3.4/.travis.yml	2015-08-05 15:33:25 UTC (rev 4070)
@@ -7,6 +7,8 @@
 # by the Free Software Foundation. 
 # See the COPYING file for more information.
 #
+sudo: false
+
 language: cpp
 
 compiler:
@@ -20,7 +22,13 @@
         - GEOS_BUILD_TOOL=cmake CFLAGS=-m32 CXXFLAGS=-m32
         - GEOS_BUILD_TOOL=cmake CFLAGS=-m64 CXXFLAGS=-m64
 
-before_install: ./tools/ci/before_install.sh
+addons:
+  apt:
+    packages:
+    - gcc-multilib
+    - g++-multilib
+    - cmake
+    - make
 
 script: ./tools/ci/script.sh
 

Deleted: branches/3.4/tools/ci/before_install.sh
===================================================================
--- branches/3.4/tools/ci/before_install.sh	2015-08-05 14:37:06 UTC (rev 4069)
+++ branches/3.4/tools/ci/before_install.sh	2015-08-05 15:33:25 UTC (rev 4070)
@@ -1,19 +0,0 @@
-#!/bin/bash -e
-#
-# Travis CI before_install runner for GEOS
-#
-# Copyright (c) 2013 Mateusz Loskot <mateusz at loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation. 
-# See the COPYING file for more information.
-#
-source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
-
-sudo apt-get update -qq
-sudo apt-get install -qq gcc-multilib g++-multilib
-
-before_install="${TRAVIS_BUILD_DIR}/tools/ci/before_install_${GEOS_BUILD_TOOL}.sh"
-[ -x ${before_install} ] && ${before_install} || echo "nothing to run"
-

Deleted: branches/3.4/tools/ci/before_install_autotools.sh
===================================================================
--- branches/3.4/tools/ci/before_install_autotools.sh	2015-08-05 14:37:06 UTC (rev 4069)
+++ branches/3.4/tools/ci/before_install_autotools.sh	2015-08-05 15:33:25 UTC (rev 4070)
@@ -1,14 +0,0 @@
-#!/bin/bash -e
-#
-# Travis CI before_install for GEOS build with GNU Autotools
-#
-# Copyright (C) 2013 Mateusz Loskot <mateusz at loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation. 
-# See the COPYING file for more information.
-#
-source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
-
-sudo apt-get install -qq make

Deleted: branches/3.4/tools/ci/before_install_cmake.sh
===================================================================
--- branches/3.4/tools/ci/before_install_cmake.sh	2015-08-05 14:37:06 UTC (rev 4069)
+++ branches/3.4/tools/ci/before_install_cmake.sh	2015-08-05 15:33:25 UTC (rev 4070)
@@ -1,14 +0,0 @@
-#!/bin/bash -e
-#
-# Travis CI before_install for GEOS build with CMake
-#
-# Copyright (C) 2013 Mateusz Loskot <mateusz at loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation. 
-# See the COPYING file for more information.
-#
-source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
-
-sudo apt-get install -qq cmake