From d333c940daf407230642d6bb0c6b7a0cf9a15a2b Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 17 Jan 2017 01:59:13 +0100
Subject: [PATCH] Update Travis.

---
 .github/travis_deploy.sh | 12 +++++++++---
 .travis.yml              |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/travis_deploy.sh b/.github/travis_deploy.sh
index fda63132..1735d52e 100644
--- a/.github/travis_deploy.sh
+++ b/.github/travis_deploy.sh
@@ -39,7 +39,9 @@ cd / && cd $upx_SRCDIR || exit 1
 rev=$(git rev-parse --verify HEAD)
 timestamp=$(git log -n1 --format='%at' HEAD)
 date=$(TZ=UTC0 date -d "@$timestamp" '+%Y%m%d-%H%M%S')
-branch="$TRAVIS_BRANCH-$date-${rev:0:6}"
+#branch="$TRAVIS_BRANCH-$date-${rev:0:6}"
+# make the branch name a little bit shorter so that is shows up nicely on GitHub
+branch="$TRAVIS_BRANCH-${date:0:8}-${rev:0:7}"
 if [[ -n $APPVEYOR_JOB_ID ]]; then
     branch="$branch-appveyor"
     git_user="AppVeyor CI"
@@ -137,7 +139,11 @@ ssh-add .git/deploy.key
 ssh-keyscan -H github.com >> ~/.ssh/known_hosts
 
 let i=0 || true
-while [[ $i -lt 10 ]]; do
+while true; do
+    if [[ $i -ge 10 ]]; then
+        echo "ERROR: git push failed"
+        exit 1
+    fi
     if [[ $new_branch == 1 ]]; then
         if git push -u $ssh_repo $branch; then break; fi
     else
@@ -146,7 +152,7 @@ while [[ $i -lt 10 ]]; do
     git fetch origin $branch
     git rebase origin/$branch $branch
     sleep $((RANDOM % 5 + 1))
-    let i=i+1
+    let i+=1
 done
 
 exit 0
diff --git a/.travis.yml b/.travis.yml
index 4eac4e66..e69f2aad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -176,11 +176,11 @@ matrix:
       compiler: clang
       env: C=clang-703-m64
     - os: osx
-      osx_image: xcode8.1
+      osx_image: xcode8.2
       compiler: clang
       env: C=clang-800-m32
     - os: osx
-      osx_image: xcode8.1
+      osx_image: xcode8.2
       compiler: clang
       env: C=clang-800-m64