Update Travis.

.github/ISSUE_TEMPLATE.md

@@ -27,5 +27,7 @@ Just read it and fill in the details we're asking, it saves so much of our time.
 ## Please tell us details about your environment.
 <!--- Include as many relevant details about the environment you experienced the bug in -->
 * UPX version used (`upx --version`):
-* Operating System and version:
-* CPU architecture:
+* Host Operating System and version:
+* Host CPU architecture:
+* Target Operating System and version:
+* Target CPU architecture:

.github/travis_build.sh

@@ -51,7 +51,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
     extra_subdirs+=( src/stub/src/arch/amd64 )
     extra_subdirs+=( src/stub/src/arch/arm/v4a )
     extra_subdirs+=( src/stub/src/arch/arm/v4t )
-    #extra_subdirs+=( src/stub/src/arch/arm64/v8 ) # FIXME / TODO
+    extra_subdirs+=( src/stub/src/arch/arm64/v8 )
     extra_subdirs+=( src/stub/src/arch/i386 )
     extra_subdirs+=( src/stub/src/arch/m68k/m68000 )
     extra_subdirs+=( src/stub/src/arch/m68k/m68020 )
@@ -63,6 +63,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
         make -C $d -f Makefile.extra maintainer-clean
         git status $d || true
     done
+    git status src/stub/src || true
     git status || true
     failed=0
     for d in ${extra_subdirs[@]}; do
@@ -79,6 +80,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
         echo "UPX-ERROR: FATAL: rebuild-stubs git status mismatch. See log file."
         exit 1
     fi
+    git status
     if [[ $BM_X == rebuild-stubs ]]; then
         echo "X=rebuild-stubs done. Exiting."
         exit 0

.github/travis_deploy.sh

@@ -96,6 +96,12 @@ else
 fi
 d=$d-$BM_C-$BM_B
 
+if [[ -n $subdir ]]; then
+    print_header "DEPLOY $subdir/$d"
+else
+    print_header "DEPLOY $d"
+fi
+
 mkdir $d || exit 1
 for exeext in .exe .out; do
     f=$upx_BUILDDIR/upx$exeext
@@ -120,8 +126,9 @@ git config user.name "$git_user"
 git config user.email "none@none"
 if [[ $new_branch == 1 ]]; then
     git checkout --orphan $branch
-    git reset --hard
+    git reset --hard || true
 fi
+git ls-files -v
 
 if [[ -n $subdir ]]; then
     [[ -d $subdir ]] || mkdir $subdir
@@ -140,7 +147,7 @@ fi
 now=$(date '+%s')
 ##date=$(TZ=UTC0 date -d "@$now" '+%Y-%m-%d %H:%M:%S')
 git commit --date="$now" -m "Automatic build $d"
-git ls-files
+git ls-files -v
 #git log --pretty=fuller
 
 umask 077
@@ -166,13 +173,11 @@ while true; do
     else
         if git push    $ssh_repo $branch; then break; fi
     fi
+    git branch -a -v
     git fetch -v origin $branch
     git branch -a -v
-    if [[ $new_branch == 1 ]]; then
-        git branch --set-upstream-to origin/$branch
-        new_branch=0
-    fi
-    git rebase origin/$branch
+    git rebase FETCH_HEAD
+    git branch -a -v
     sleep $((RANDOM % 5 + 1))
     let i+=1
 done

.github/travis_init.sh

@@ -214,6 +214,11 @@ done
 make_absolute lcov_OUTPUTDIR
 unset var_prefix var_suffix
 
+print_header() {
+    local x="==========="; x="$x$x$x$x$x$x$x"
+    echo -e "\n${x}\n${1}\n${x}\n"
+}
+
 print_settings() {
     local v var_prefix var_suffix
     # Build Matrix

.github/travis_testsuite_1.sh

@@ -36,8 +36,7 @@ if [[ ! -d $upx_testsuite_SRCDIR/files/packed ]]; then exit 1; fi
 # ************************************************************************/
 
 testsuite_header() {
-    local x="==========="; x="$x$x$x$x$x$x$x"
-    echo -e "\n${x}\n${1}\n${x}\n"
+    print_header "$1"
 }
 
 testsuite_split_f() {

.gitignore

@@ -1,5 +1,6 @@
 /.bzr*
 /.hg*
+/.vscode*
 /Makevars.global*
 /build*
 /maint*

.travis.yml

@@ -12,19 +12,16 @@ notifications: { email: { on_success: never, on_failure: change } }
   - llvm-toolchain-precise-3.6
   - llvm-toolchain-precise-3.7
   - llvm-toolchain-precise-3.8
+  - llvm-toolchain-precise-3.9
 
 env:
   global:
     - CROSS= C= B= T= X=
     - secure: "YXHLXK+CM5d8yELIUSSs+P0/CoefClO7/AUX1oBj5W75g+YzR5uS2doVsB8UH8S8/GdNxk4P9Jgn4EiEVnjfGgn2eAD9MVpDPIxyJs5vI+5G77asq3QNdSl6QFv3O9I/6yBoVCewgPFPqsMd7Yvs/Ea3LcQkqalVhrC8ybYtmfs6VL2w33gn2J3b3TCn/s21L0ijklM0xvP1GNMDtuUpTSish5wvGOHE/91rwtdUDbJR8u31QY7fTASDiNnL/7ihgEIZ5XxpDYXviX1GC+nemhX1fWpmVmuT8m30Ruodi0yJVGASw9i2SaKv/VX/fJ/w2vlCfspL5LMZKkVLlfpIo3mQGqmMHFxv7mNy+hRu50ptoWNSkWArcqifwveh2liHUpl4jTvWaVll5Tw5VUGJhAUdzCTnqLIbWFnKIgCedL3iRFi4+EbyWNxel8lFESMOTDZFfJG5yEiDJbgbLsUaT2GmrsOphwAG7zDcZzvYTdjg/lF4Wh0MUnQJ+0MhDpii8Ahjp49lAPdw8uRQyyY7d7ksYKXVIkbgl6dRCC5vZSPucJiFjq2BClqIoEmzZPvHveDbovzFkNhJX9tFLrHLcXbPPcegww1FGoQ3wBM6JwJ+TvSD6N4OdCmou05aDuuQeznHi3GxOScjGwxdMIU28fdJDCTDg2rOihm22kHVajo="
     - secure: "JpSv3+QRmHcfN/bmT3mVkqET44NCPhM/qpcUssCVXnd2GW0qWURoyPHzVMn/gbeAkUjR6djtN3OzJ+M181QmlmTmE26pZC9Q6r1buNDWdkIH1FcpMCa67BBAjmq+yDwulDtvCMv0lbz60v57lzHBOLczF3yMxBVTjXxt1RsrzDLHzzVaDR5lEe+sQUNeRL7Vaq8crimPNTr4ZhMe59eweTO/3AWovuSPf250k1flfv7I8audZgrVZdbVKvj5C3Sziy1AGXcu8mDfET9/Ya2XBCQHWODjiKlnhSxqthhP3gQuacaLjpS2FjvQlamd+I9x6BBoLSeNbiXD9vgCydDUKvmUrU+zQs64U1hHk9WZWVC19kG7lTtTdanGDIUlIUtFZgqE4AQpJaIUWkUmHGyHi61JMvduzX21eL5c5j9DoJteX42FPb1n3xK/JSnUkLMpbFdQuy5inhzefhDfeNzaYxt8nPwHnJqrF73SW4PLDKeRyzvg/P+zqcou8nXrHfA1z9/FlnYzf7Qc9meai9Q/JARX3Q1ZKu5uyG+RuBLe2POq0192w6pflTr1ZlLJsKNSc1147PviKfmpla1lg3/6uVzMp5tgwbve/hx9SDXiRueGttKw/ymsY662+8G24NRKo4fxNklWFHaB4owM84edDzXDckPXbPgue8/HQT8BFio="
-  matrix:
-    - TRAVIS_EMPTY_JOB_WORKAROUND=true
 
 matrix:
   fast_finish: true
-  exclude:
-    - env: TRAVIS_EMPTY_JOB_WORKAROUND=true
   include:
     - os: linux
       sudo: required
@@ -162,20 +159,28 @@ matrix:
       addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
     - os: linux
       compiler: clang
-      env: C=clang-3.8-m64 B=debug+sanitize
-      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+      env: C=clang-3.9-m32
+      addons: { apt: { sources: *S, packages: [ "clang-3.9", "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: clang
-      env: C=clang-3.8-m64 B=sanitize
-      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+      env: C=clang-3.9-m64
+      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
     - os: linux
       compiler: clang
-      env: C=clang-3.8-m64 B=debug+scan-build
-      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+      env: C=clang-3.9-m64 B=debug+sanitize
+      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
     - os: linux
       compiler: clang
-      env: C=clang-3.8-m64 B=scan-build
-      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+      env: C=clang-3.9-m64 B=sanitize
+      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64 B=debug+scan-build
+      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64 B=scan-build
+      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
     - os: linux
       compiler: gcc
       env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=SKIP
@@ -211,13 +216,13 @@ matrix:
       compiler: clang
       env: C=clang-703-m64
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       compiler: clang
-      env: C=clang-800-m32
+      env: C=clang-802-m32
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       compiler: clang
-      env: C=clang-800-m64
+      env: C=clang-802-m64
 
 install:
   - uname -a; pwd; id; umask
@@ -247,6 +252,11 @@ install:
     fi
 
 script:
-  - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_build.sh && bash ./.github/travis_testsuite_1.sh && bash ./.github/travis_deploy.sh
+  - success=1
+  - cd $TRAVIS_BUILD_DIR || success=0
+  - test $success = 0 || bash ./.github/travis_build.sh || success=0
+  - test $success = 0 || bash ./.github/travis_testsuite_1.sh || success=0
+  - test $success = 0 || bash ./.github/travis_deploy.sh || success=0
+  - test $success = 1
 
 # vim:set ts=2 sw=2 et: