mirror of
https://github.com/upx/upx.git
synced 2025-03-04 05:53:50 +00:00
Update Travis.
This commit is contained in:
Markus F.X.J. Oberhumer
parent
2fcc3f86c0
commit
88cb5886f3
@ -14,8 +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-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 }
|
||||
- { C: msvc-14.1-x86, CL_VERSION: 19.14, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
|
||||
- { C: msvc-14.1-x64, CL_VERSION: 19.14, 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:
|
||||
|
||||
8
.github/travis_deploy.sh
vendored
8
.github/travis_deploy.sh
vendored
@ -103,6 +103,14 @@ else
|
||||
fi
|
||||
d=$d-$BM_C-$BM_B
|
||||
|
||||
# remove redundant -m32/-m64/-x86/-x64 from directory name
|
||||
if [[ $d =~ ^((i386-darwin|i386-linux|i386-win32).*)(-m32|-x86)(-.+)?$ ]]; then
|
||||
d="${BASH_REMATCH[1]}${BASH_REMATCH[4]}"
|
||||
fi
|
||||
if [[ $d =~ ^((amd64-darwin|amd64-linux|amd64-win64).*)(-m64|-x64)(-.+)?$ ]]; then
|
||||
d="${BASH_REMATCH[1]}${BASH_REMATCH[4]}"
|
||||
fi
|
||||
|
||||
if [[ -n $subdir ]]; then
|
||||
print_header "DEPLOY $subdir/$d"
|
||||
else
|
||||
|
||||
31
.github/travis_init.sh
vendored
31
.github/travis_init.sh
vendored
@ -134,18 +134,25 @@ if [[ -n $BM_CROSS ]]; then
|
||||
fi # BM_CROSS
|
||||
if [[ "$CC" == "false" ]]; then # generic
|
||||
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-[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-[567]-m?? | gcc-[567]-mx32)
|
||||
v=${BM_C:4:1}; CC="gcc-$v"; CXX="g++-$v" ;;
|
||||
esac
|
||||
if [[ $TRAVIS_OS_NAME == osx ]]; then
|
||||
case $BM_C in
|
||||
clang | clang-m?? | clang-[6789][0-9][0-9]-m?? | clang-10[0-9][0-9]-m??)
|
||||
CC="clang"; CXX="clang++" ;; # standard system compiler
|
||||
esac
|
||||
else
|
||||
case $BM_C in
|
||||
clang | clang-m?? | clang-3.4-m??)
|
||||
CC="clang"; CXX="clang++" ;; # standard system compiler
|
||||
clang-[3456].[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-[5678]-m?? | gcc-[5678]-mx32)
|
||||
v=${BM_C:4:1}; CC="gcc-$v"; CXX="g++-$v" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
fi # generic
|
||||
case $BM_C in
|
||||
|
||||
48
.travis.yml
48
.travis.yml
@ -19,7 +19,9 @@ notifications: { email: { on_success: never, on_failure: change } }
|
||||
# Ubuntu 14.04 LTS "Trusty"
|
||||
.ubuntu_trusty_toolchain_sources: &TS
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-4.0
|
||||
- llvm-toolchain-trusty-5.0
|
||||
- llvm-toolchain-trusty-6.0
|
||||
|
||||
env:
|
||||
global:
|
||||
@ -133,6 +135,16 @@ matrix:
|
||||
compiler: gcc
|
||||
env: C=gcc-7-m64
|
||||
addons: { apt: { sources: *TS, packages: [ "g++-7" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env: C=gcc-8-m32
|
||||
addons: { apt: { sources: *TS, packages: [ "g++-8-multilib", "zlib1g-dev:i386" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env: C=gcc-8-m64
|
||||
addons: { apt: { sources: *TS, packages: [ "g++-8" ] } }
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env: C=clang-3.4-m32
|
||||
@ -196,6 +208,16 @@ matrix:
|
||||
compiler: clang
|
||||
env: C=clang-3.9-m64 B=scan-build
|
||||
addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: clang
|
||||
env: C=clang-4.0-m32
|
||||
addons: { apt: { sources: *TS, packages: [ "clang-4.0", "g++-7-multilib", "zlib1g-dev:i386" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: clang
|
||||
env: C=clang-4.0-m64
|
||||
addons: { apt: { sources: *TS, packages: [ "clang-4.0" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: clang
|
||||
@ -206,6 +228,16 @@ matrix:
|
||||
compiler: clang
|
||||
env: C=clang-5.0-m64
|
||||
addons: { apt: { sources: *TS, packages: [ "clang-5.0" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: clang
|
||||
env: C=clang-6.0-m32
|
||||
addons: { apt: { sources: *TS, packages: [ "clang-6.0", "g++-7-multilib", "zlib1g-dev:i386" ] } }
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: clang
|
||||
env: C=clang-6.0-m64
|
||||
addons: { apt: { sources: *TS, packages: [ "clang-6.0" ] } }
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=qemu
|
||||
@ -249,13 +281,21 @@ matrix:
|
||||
compiler: clang
|
||||
env: C=clang-802-m64
|
||||
- os: osx
|
||||
osx_image: xcode9.2
|
||||
osx_image: xcode9.4
|
||||
compiler: clang
|
||||
env: C=clang-900-m32
|
||||
env: C=clang-902-m32
|
||||
- os: osx
|
||||
osx_image: xcode9.2
|
||||
osx_image: xcode9.4
|
||||
compiler: clang
|
||||
env: C=clang-900-m64
|
||||
env: C=clang-902-m64
|
||||
- os: osx
|
||||
osx_image: xcode10
|
||||
compiler: clang
|
||||
env: C=clang-1000-m32
|
||||
- os: osx
|
||||
osx_image: xcode10
|
||||
compiler: clang
|
||||
env: C=clang-1000-m64
|
||||
|
||||
install:
|
||||
- uname -a; pwd; id; umask
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user