Update Travis.

upx · Jan 19, 2018 · 9485a56 · 9485a56
1 parent 021c8db
commit 9485a56
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 53 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -14,10 +14,8 @@ environment:
     - { C: msvc-12.0-x64, CL_VERSION: 18.00, VS_VERSION: 2013 }
     - { C: msvc-14.0-x86, CL_VERSION: 19.00, VS_VERSION: 2015 }
     - { C: msvc-14.0-x64, CL_VERSION: 19.00, VS_VERSION: 2015 }
-    - { C: msvc-15.0-x86, CL_VERSION: 19.10, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
-    - { C: msvc-15.0-x64, CL_VERSION: 19.10, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
-#   - { C: gcc-4.9-m32, T: SKIP }
-#   - { C: gcc-4.9-m64, T: SKIP }
+    - { C: msvc-14.1-x86, CL_VERSION: 19.12, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
+    - { C: msvc-14.1-x64, CL_VERSION: 19.12, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
   UPX_AUTOMATIC_BUILDS_SSL_KEY:
     secure: PZMpVeqnEYe39kK+Zu2/fnmZ6/HG6Lvls0hh9GMVU9vCWsr8xaU7kIbHBS01puUkb4bEWPILKYvSEDuhOhguDjd/P4QdXWipvV/F2GaVax0=
   UPX_AUTOMATIC_BUILDS_SSL_IV:
@@ -58,17 +56,11 @@ install:
   - if "%C%"=="msvc-12.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 )
   - if "%C%"=="msvc-14.0-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 )
   - if "%C%"=="msvc-14.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 )
-  - if "%C%"=="msvc-15.0-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 )
-  - if "%C%"=="msvc-15.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 )
+  - if "%C%"=="msvc-14.1-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 )
+  - if "%C%"=="msvc-14.1-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 )
 
 build_script:
   - cd c:\projects\upx
-  - if "%C%"=="gcc-4.9-m32" set PATH=c:\cygwin\bin;%PATH%
-  - if "%C%"=="gcc-4.9-m32" bash -x ./.github/travis_build.sh
-  - if "%C%"=="gcc-4.9-m32" exit
-  - if "%C%"=="gcc-4.9-m64" set PATH=c:\cygwin\bin;%PATH%
-  - if "%C%"=="gcc-4.9-m64" bash -x ./.github/travis_build.sh
-  - if "%C%"=="gcc-4.9-m64" exit
   # setup directories following the VPATH build in travis_build.sh
   - where cl & where link
   - set BDIR=c:\projects\build\%C%\%B%
@@ -89,7 +81,7 @@ build_script:
   - set s=c:\projects\upx\src
   - cat .GITREV.txt
   - set /p GITREV=<.GITREV.txt
-  - cl -MT -EHsc -J -O2 -W4 -WX -DUPX_VERSION_GITREV="""%GITREV%""" %DEFS% -DWITH_LZMA=0x443 -DUCL_NO_ASM -I%s%\lzma-sdk -Ic:\projects\deps\ucl-1.03\include -Ic:\projects\deps\zlib-1.2.8 -Feupx.exe %s%\*.cpp %BDIR%\ucl-1.03\ucl.lib %BDIR%\zlib-1.2.8\zlib.lib
+  - cl -MT -EHsc -J -O2 -W4 -WX -DUPX_VERSION_GITREV="""%GITREV%""" %DEFS% -DUCL_NO_ASM -I%s%\lzma-sdk -Ic:\projects\deps\ucl-1.03\include -Ic:\projects\deps\zlib-1.2.8 -Feupx.exe %s%\*.cpp %BDIR%\ucl-1.03\ucl.lib %BDIR%\zlib-1.2.8\zlib.lib
 
 test_script:
   - set UPX=--no-color --no-progress

diff --git a/.github/travis_init.sh b/.github/travis_init.sh
@@ -137,13 +137,13 @@ if [[ -z $BM_CROSS ]]; then
     case $BM_C in
         clang | clang-m?? | clang-3.4-m?? | clang-[6789][0-9][0-9]-m??)
             CC="clang"; CXX="clang++" ;; # standard system compiler
-        clang-[3].[0-9]-m??)
+        clang-[345].[0-9]-m??)
             v=${BM_C:6:3}; CC="clang-$v"; CXX="clang++-$v"; SCAN_BUILD="scan-build-$v" ;;
         gcc | gcc-m?? | gcc-mx32)
             CC="gcc"; CXX="g++" ;; # standard system compiler
         gcc-[34].[0-9]-m?? | gcc-[34].[0-9]-mx32)
             v=${BM_C:4:3}; CC="gcc-$v"; CXX="g++-$v" ;;
-        gcc-[56]-m?? | gcc-[56]-mx32)
+        gcc-[567]-m?? | gcc-[567]-mx32)
             v=${BM_C:4:1}; CC="gcc-$v"; CXX="g++-$v" ;;
     esac
 fi

diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,20 @@ language: cpp
 
 notifications: { email: { on_success: never, on_failure: change } }
 
-.ubuntu_toolchain_sources: &S
+# Ubuntu 12.04 LTS "Precise"
+.ubuntu_precise_toolchain_sources: &PS
   - ubuntu-toolchain-r-test
   - llvm-toolchain-precise-3.5
   - llvm-toolchain-precise-3.6
   - llvm-toolchain-precise-3.7
   - llvm-toolchain-precise-3.8
   - llvm-toolchain-precise-3.9
 
+# Ubuntu 14.04 LTS "Trusty"
+.ubuntu_trusty_toolchain_sources: &TS
+  - ubuntu-toolchain-r-test
+  - llvm-toolchain-trusty-5.0
+
 env:
   global:
     - CROSS= C= B= T= X=
@@ -25,27 +31,26 @@ matrix:
   fast_finish: true
   include:
     - os: linux
-      sudo: required
       dist: trusty
       compiler: gcc
       env: X=rebuild-stubs
       addons: { apt: { packages: [ "g++-multilib", "lib32z1" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.4-m32
-      addons: { apt: { sources: *S, packages: [ "g++-4.4-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.4-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.4-m64
-      addons: { apt: { sources: *S, packages: [ "g++-4.4" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.4" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.5-m32
-      addons: { apt: { sources: *S, packages: [ "g++-4.5-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.5-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.5-m64
-      addons: { apt: { sources: *S, packages: [ "g++-4.5" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.5" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.6-m32
@@ -56,69 +61,78 @@ matrix:
     - os: linux
       compiler: gcc
       env: C=gcc-4.7-m32
-      addons: { apt: { sources: *S, packages: [ "g++-4.7-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.7-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.7-m64
-      addons: { apt: { sources: *S, packages: [ "g++-4.7" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.7" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.8-m32
-      addons: { apt: { sources: *S, packages: [ "g++-4.8-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.8-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.8-m64
-      addons: { apt: { sources: *S, packages: [ "g++-4.8" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.8" ] } }
     - os: linux
-      sudo: required
       dist: trusty
       compiler: gcc
       env: C=gcc-4.8-mx32
       addons: { apt: { packages: [ "g++-multilib", "libx32stdc++-4.8-dev" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.9-m32
-      addons: { apt: { sources: *S, packages: [ "g++-4.9-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.9-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-4.9-m64
-      addons: { apt: { sources: *S, packages: [ "g++-4.9" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-4.9" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-5-m32
-      addons: { apt: { sources: *S, packages: [ "g++-5-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-5-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-5-m64
-      addons: { apt: { sources: *S, packages: [ "g++-5" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-5" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m32
-      addons: { apt: { sources: *S, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m64
-      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m32 B=debug
-      addons: { apt: { sources: *S, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m64 B=debug
-      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m64 B=debug+sanitize
-      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m64 B=sanitize
-      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
     - os: linux
       compiler: gcc
       env: C=gcc-6-m64 B=valgrind T=valgrind
-      addons: { apt: { sources: *S, packages: [ "g++-6", valgrind ] } }
+      addons: { apt: { sources: *PS, packages: [ "g++-6", valgrind ] } }
+    - os: linux
+      dist: trusty
+      compiler: gcc
+      env: C=gcc-7-m32
+      addons: { apt: { sources: *TS, packages: [ "g++-7-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      dist: trusty
+      compiler: gcc
+      env: C=gcc-7-m64
+      addons: { apt: { sources: *TS, packages: [ "g++-7" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.4-m32
@@ -129,59 +143,69 @@ matrix:
     - os: linux
       compiler: clang
       env: C=clang-3.5-m32
-      addons: { apt: { sources: *S, packages: [ "clang-3.5", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.5", "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.5-m64
-      addons: { apt: { sources: *S, packages: [ "clang-3.5" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.5" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.6-m32
-      addons: { apt: { sources: *S, packages: [ "clang-3.6", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.6", "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.6-m64
-      addons: { apt: { sources: *S, packages: [ "clang-3.6" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.6" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.7-m32
-      addons: { apt: { sources: *S, packages: [ "clang-3.7", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.7", "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.7-m64
-      addons: { apt: { sources: *S, packages: [ "clang-3.7" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.7" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.8-m32
-      addons: { apt: { sources: *S, packages: [ "clang-3.8", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.8", "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.8-m64
-      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.8" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.9-m32
-      addons: { apt: { sources: *S, packages: [ "clang-3.9", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9", "g++-6-multilib", "zlib1g-dev:i386" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.9-m64
-      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.9-m64 B=debug+sanitize
-      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
     - os: linux
       compiler: clang
       env: C=clang-3.9-m64 B=sanitize
-      addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
+      addons: { apt: { sources: *PS, 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" ] } }
+      addons: { apt: { sources: *PS, 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" ] } }
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
+    - os: linux
+      dist: trusty
+      compiler: clang
+      env: C=clang-5.0-m32
+      addons: { apt: { sources: *TS, packages: [ "clang-5.0", "g++-7-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      dist: trusty
+      compiler: clang
+      env: C=clang-5.0-m64
+      addons: { apt: { sources: *TS, packages: [ "clang-5.0" ] } }
     - os: linux
       compiler: gcc
       env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=qemu
@@ -225,11 +249,11 @@ matrix:
       compiler: clang
       env: C=clang-802-m64
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       compiler: clang
       env: C=clang-900-m32
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       compiler: clang
       env: C=clang-900-m64