From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 15 Jun 2017 06:56:43 +0000 (+0200)
Subject: travis: minor cosmetics
X-Git-Tag: v2.31-rc1~293^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf76bbae48f3fe4d00d416a9b91d09672fe2173a;p=thirdparty%2Futil-linux.git

travis: minor cosmetics

This is just to make the diff to my private travis script a bit smaller.

Now we always use $CC _after_ the install script which makes it possible
to install/update the compiler in the install section.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/.travis-functions.sh b/.travis-functions.sh
index db50f0997d..ece05d409c 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -17,8 +17,15 @@ MAKE="make -j2"
 DUMP_CONFIG_LOG="short"
 export TS_OPT_parsable="yes"
 
+# workaround ugly warning on travis OSX,
+# see https://github.com/direnv/direnv/issues/210
+shell_session_update() { :; }
+
 function xconfigure
 {
+	which "$CC"
+	"$CC" --version
+
 	./configure "$@" $OSX_CONFOPTS
 	err=$?
 	if [ "$DUMP_CONFIG_LOG" = "short" ]; then
@@ -58,7 +65,8 @@ function check_root
 	osx_prepare_check
 	sudo -E $MAKE check TS_OPTS="$opts" || return
 
-	sudo $MAKE install || return
+	# keep PATH to make sure sudo would find $CC
+	sudo env "PATH=$PATH" $MAKE install || return
 }
 
 function check_dist
@@ -75,8 +83,8 @@ function travis_install_script
 		return
 	fi
 
-	# install some packages from Ubuntu's default sources
-	sudo apt-get -qq update
+	# install required packages
+	sudo apt-get -qq update --fix-missing
 	sudo apt-get install -qq >/dev/null \
 		bc \
 		btrfs-tools \
diff --git a/.travis.yml b/.travis.yml
index 598b5f13dd..eaed0fa49b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ env:
 
 matrix:
   include:
-    - os: linux
-      dist: precise
+    # test old Ubuntu 12.04 and OSX for compatibility
+    - dist: precise
       compiler: gcc
       env: PRECISE="yes" MAKE_CHECK="root"
     - os: osx
@@ -35,10 +35,6 @@ branches:
 before_install:
   # print some host info
   - env | grep -v "encrypted" | LC_ALL=C sort
-  - $CC --version
-  - which $CC
-  # workaround clang not system wide, fail on sudo make install
-  - export CC=`which $CC`
   # workaround travis-ci issue #5301
   - unset PYTHON_CFLAGS