Use travis_retry for commands that may fail due to network issues

2 files changed, 48 insertions, 48 deletions

diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index 2510a791f..bc82fd5bd 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -3,108 +3,108 @@
 set -e # exit on failure (same as -o errexit)
 
 lsb_release -a
-sudo apt-get -qq update
+travis_retry sudo apt-get -qq update
 
 if [[ "$CC" == gcc-5 ]]; then
-	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-	sudo apt-get -qq update
-	sudo apt-get install -qq g++-5
+	travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+	travis_retry sudo apt-get -qq update
+	travis_retry sudo apt-get install -qq g++-5
 elif [[ "$CC" == gcc-6 ]]; then
-	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-	sudo apt-get -qq update
-	sudo apt-get install -qq g++-6
+	travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+	travis_retry sudo apt-get -qq update
+	travis_retry sudo apt-get install -qq g++-6
 fi
 
-sudo apt-get -qq install libboost-dev
+travis_retry sudo apt-get -qq install libboost-dev
 
 WITHLANG=$SWIGLANG
 
 case "$SWIGLANG" in
 	"")     ;;
 	"csharp")
-		sudo apt-get -qq install mono-devel
+		travis_retry sudo apt-get -qq install mono-devel
 		;;
 	"d")
-		wget http://downloads.dlang.org/releases/2014/dmd_2.066.0-0_amd64.deb
-		sudo dpkg -i dmd_2.066.0-0_amd64.deb
+		travis_retry wget http://downloads.dlang.org/releases/2014/dmd_2.066.0-0_amd64.deb
+		travis_retry sudo dpkg -i dmd_2.066.0-0_amd64.deb
 		;;
 	"go")
 		;;
 	"javascript")
 		case "$ENGINE" in
 			"node")
-				sudo add-apt-repository -y ppa:chris-lea/node.js
-				sudo apt-get -qq update
-				sudo apt-get install -qq nodejs rlwrap
-				sudo npm install -g node-gyp
+				travis_retry sudo add-apt-repository -y ppa:chris-lea/node.js
+				travis_retry sudo apt-get -qq update
+				travis_retry sudo apt-get install -qq nodejs rlwrap
+				travis_retry sudo npm install -g node-gyp
 				;;
 			"jsc")
-				sudo apt-get install -qq libwebkitgtk-dev
+				travis_retry sudo apt-get install -qq libwebkitgtk-dev
 				;;
 			"v8")
-				sudo apt-get install -qq libv8-dev
+				travis_retry sudo apt-get install -qq libv8-dev
 				;;
 		esac
 		;;
 	"guile")
-		sudo apt-get -qq install guile-2.0-dev
+		travis_retry sudo apt-get -qq install guile-2.0-dev
 		;;
 	"lua")
 		if [[ -z "$VER" ]]; then
-			sudo apt-get -qq install lua5.2 liblua5.2-dev
+			travis_retry sudo apt-get -qq install lua5.2 liblua5.2-dev
 		else
-			sudo add-apt-repository -y ppa:ubuntu-cloud-archive/mitaka-staging
-			sudo apt-get -qq update
-			sudo apt-get -qq install lua${VER} liblua${VER}-dev
+			travis_retry sudo add-apt-repository -y ppa:ubuntu-cloud-archive/mitaka-staging
+			travis_retry sudo apt-get -qq update
+			travis_retry sudo apt-get -qq install lua${VER} liblua${VER}-dev
 		fi
 		;;
 	"ocaml")
 		# configure also looks for ocamldlgen, but this isn't packaged.  But it isn't used by default so this doesn't matter.
-		sudo apt-get -qq install ocaml ocaml-findlib
+		travis_retry sudo apt-get -qq install ocaml ocaml-findlib
 		;;
 	"octave")
 		if [[ -z "$VER" ]]; then
-			sudo apt-get -qq install liboctave-dev
+			travis_retry sudo apt-get -qq install liboctave-dev
 		else
-			sudo add-apt-repository -y ppa:kwwette/octaves
-			sudo apt-get -qq update
-			sudo apt-get -qq install liboctave${VER}-dev
+			travis_retry sudo add-apt-repository -y ppa:kwwette/octaves
+			travis_retry sudo apt-get -qq update
+			travis_retry sudo apt-get -qq install liboctave${VER}-dev
 		fi
 		;;
 	"php5")
-		sudo apt-get -qq install php5-cli php5-dev
+		travis_retry sudo apt-get -qq install php5-cli php5-dev
 		;;
 	"php")
-		sudo add-apt-repository -y ppa:ondrej/php
-		sudo apt-get -qq update
-		sudo apt-get -qq install php$VER-cli php$VER-dev
+		travis_retry sudo add-apt-repository -y ppa:ondrej/php
+		travis_retry sudo apt-get -qq update
+		travis_retry sudo apt-get -qq install php$VER-cli php$VER-dev
 		;;
 	"python")
 		pip install pep8
 		if [[ "$PY3" ]]; then
-			sudo apt-get install -qq python3-dev
+			travis_retry sudo apt-get install -qq python3-dev
 		fi
 		WITHLANG=$SWIGLANG$PY3
 		if [[ "$VER" ]]; then
-			sudo add-apt-repository -y ppa:fkrull/deadsnakes
-			sudo apt-get -qq update
-			sudo apt-get -qq install python${VER}-dev
+			travis_retry sudo add-apt-repository -y ppa:fkrull/deadsnakes
+			travis_retry sudo apt-get -qq update
+			travis_retry sudo apt-get -qq install python${VER}-dev
 			WITHLANG=$SWIGLANG$PY3=$SWIGLANG$VER
 		fi
 		;;
 	"r")
-		sudo apt-get -qq install r-base
+		travis_retry sudo apt-get -qq install r-base
 		;;
 	"ruby")
 		if [[ "$VER" ]]; then
-			rvm install $VER
+			travis_retry rvm install $VER
 		fi
 		;;
 	"scilab")
-		sudo apt-get -qq install scilab
+		travis_retry sudo apt-get -qq install scilab
 		;;
 	"tcl")
-		sudo apt-get -qq install tcl-dev
+		travis_retry sudo apt-get -qq install tcl-dev
 		;;
 esac
 
diff --git a/Tools/travis-osx-install.sh b/Tools/travis-osx-install.sh
index 85183722b..42cc33bb2 100755
--- a/Tools/travis-osx-install.sh
+++ b/Tools/travis-osx-install.sh
@@ -3,28 +3,28 @@
 set -e # exit on failure (same as -o errexit)
 
 sw_vers
-brew update
-brew list
-# brew install pcre # Travis Xcode-7.3 has pcre
-# brew install boost
+travis_retry brew update
+travis_retry brew list
+# travis_retry brew install pcre # Travis Xcode-7.3 has pcre
+# travis_retry brew install boost
 
 WITHLANG=$SWIGLANG
 
 case "$SWIGLANG" in
 	"csharp")
-		brew install mono
+		travis_retry brew install mono
 		;;
 	"guile")
-		Tools/brew-install guile
+		travis_retry Tools/brew-install guile
 		;;
 	"lua")
-		brew install lua
+		travis_retry brew install lua
 		;;
 	"python")
 		WITHLANG=$SWIGLANG$PY3
 		if [[ "$PY3" ]]; then
-			brew install python3
-			brew list -v python3
+			travis_retry brew install python3
+			travis_retry brew list -v python3
 		fi
 		;;
 esac