From 1c6eab00d1ab76119abd43b3d8a79a1681e5a190 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 23 Mar 2017 02:07:08 +0100 Subject: [PATCH] Update Travis. --- .appveyor.yml | 7 +- .circle.yml | 31 ---- .github/travis_build.sh | 5 +- .github/travis_deploy.sh | 8 +- .github/travis_init.sh | 4 +- .gitlab-ci.yml | 295 --------------------------------------- .travis.yml | 22 ++- 7 files changed, 28 insertions(+), 344 deletions(-) delete mode 100644 .circle.yml delete mode 100644 .gitlab-ci.yml diff --git a/.appveyor.yml b/.appveyor.yml index 154ee438..254436cf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,6 +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 } UPX_AUTOMATIC_BUILDS_SSL_KEY: @@ -23,7 +25,7 @@ environment: init: - git config --global core.autocrlf input - - where bash & where cat & where chmod & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar + - where bash & where cat & where chmod & where cmp & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar # - bash --version & git --version & sed --version & tar --version - git --version & bash --version # - dir "c:\Program Files\Git\usr\bin" @@ -32,6 +34,7 @@ init: # - dir "c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin" install: + - set PATH=%PATH%;C:\Program Files\Git\mingw64\bin - cd c:\projects - md build build\%C% deps - cd c:\projects\upx @@ -56,6 +59,8 @@ 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 ) build_script: - cd c:\projects\upx diff --git a/.circle.yml b/.circle.yml deleted file mode 100644 index 00055a1a..00000000 --- a/.circle.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Support for Circle CI -- https://circleci.com/gh/upx/upx -# Copyright (C) Markus Franz Xaver Johannes Oberhumer - -machine: - environment: - TRAVIS_OS_NAME: linux - CROSS: - C: gcc-4.8-m64 - B: release - T: - X: - -checkout: - post: - - git submodule update --init --recursive - -dependencies: - pre: - - mkdir -p ../deps - - cd ../deps && wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -xJ - - cd ../deps && wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -xJ - - cd ../deps && git clone https://github.com/upx/upx-testsuite - override: - - mkdir -p ../build/travis - - bash ./.github/travis_build.sh - -test: - override: - - bash ./.github/travis_testsuite_1.sh - -# vim:set ts=2 sw=2 et: diff --git a/.github/travis_build.sh b/.github/travis_build.sh index 86a7966f..3e2a3937 100644 --- a/.github/travis_build.sh +++ b/.github/travis_build.sh @@ -66,7 +66,10 @@ fi # cd / && cd $ucl_BUILDDIR || exit 1 -if [[ -n $BM_CROSS || $TRAVIS_OS_NAME == windows ]]; then +# patch UCL +sed 's/^#elif (ACC_ARCH_AMD64 || ACC_ARCH_IA64)$/& \&\& !defined(__ILP32__)/' $ucl_SRCDIR/acc/acc_chk.ch > a.tmp +if cmp -s a.tmp $ucl_SRCDIR/acc/acc_chk.ch; then rm a.tmp; else mv a.tmp $ucl_SRCDIR/acc/acc_chk.ch; fi +if [[ $BUILD_LOCAL_UCL == 1 ]]; then # ucl-1.03/configure is too old - build manually rm -f ./*.o libucl.a $CC -O2 -I$ucl_SRCDIR/include -I$ucl_SRCDIR -c $ucl_SRCDIR/src/*.c diff --git a/.github/travis_deploy.sh b/.github/travis_deploy.sh index e97c4eb7..e1568089 100644 --- a/.github/travis_deploy.sh +++ b/.github/travis_deploy.sh @@ -35,9 +35,10 @@ else branch=$TRAVIS_BRANCH if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi fi -subdir=${subdir%%:*}; subdir=${subdir%%/*}; subdir=${subdir%%-*} +subdir=${subdir%%:*}; subdir=${subdir%%/*}; subdir=${subdir%%--*} case $branch in devel*) ;; + gitlab*) ;; master*) ;; travis*) ;; *) exit 0;; @@ -166,6 +167,11 @@ while true; do if git push $ssh_repo $branch; then break; fi fi 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 sleep $((RANDOM % 5 + 1)) let i+=1 diff --git a/.github/travis_init.sh b/.github/travis_init.sh index f5ce0eca..91dae9c9 100644 --- a/.github/travis_init.sh +++ b/.github/travis_init.sh @@ -49,6 +49,7 @@ if [[ -z $CC_OVERRIDE ]]; then CC=false CXX=false SCAN_BUILD=false AR=ar SIZE=size if [[ -n $APPVEYOR_JOB_ID ]]; then + BUILD_LOCAL_UCL=1 BUILD_LOCAL_ZLIB=1 if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" @@ -65,6 +66,7 @@ if [[ -n $APPVEYOR_JOB_ID ]]; then esac fi # APPVEYOR_JOB_ID if [[ -n $BM_CROSS ]]; then + BUILD_LOCAL_UCL=1 BUILD_LOCAL_ZLIB=1 if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" @@ -148,7 +150,7 @@ case $BM_C in clang*-m64) CC="$CC -m64"; CXX="$CXX -m64" ;; gcc*-m32) CC="$CC -m32"; CXX="$CXX -m32" ;; gcc*-m64) CC="$CC -m64"; CXX="$CXX -m64" ;; - gcc*-mx32) CC="$CC -mx32"; CXX="$CXX -mx32" ;; + gcc*-mx32) CC="$CC -mx32"; CXX="$CXX -mx32"; BUILD_LOCAL_ZLIB=1 ;; esac if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then CC="$CC -std=gnu89" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index ab989445..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,295 +0,0 @@ -# Support for GibLab CI -- https://gitlab.com/ -# Copyright (C) Markus Franz Xaver Johannes Oberhumer - -before_script: - - export TRAVIS_OS_NAME=linux - - unset CROSS C B T X - - uname -a; pwd; id; umask - - cat /etc/os-release || true - - | - if [[ $CI_BUILD_NAME =~ ^(CentOS|Fedora|OpenSUSE) ]]; then - time rpm -qa | LC_ALL=C sort - fi - - | - if [[ $CI_BUILD_NAME =~ ^(Debian|Ubuntu) ]]; then - export DEBIAN_FRONTEND=noninteractive - time dpkg -l - if [[ $CI_BUILD_NAME =~ ^Ubuntu1604- ]]; then - dpkg --add-architecture i386 - fi; - time apt-get -yq update - fi - - - if [[ $CI_BUILD_NAME =~ ^CentOS5- ]]; then - time rpm -Uvh http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm; - time yum install -y - coreutils curl diffutils grep gzip sed - bzip2 file findutils git openssh-clients openssl perl tar wget which xz - gcc gcc-c++ make valgrind - glibc-devel libstdc++-devel zlib-devel - glibc-devel.i386 libstdc++-devel.i386 zlib-devel.i386; - fi - - - if [[ $CI_BUILD_NAME =~ ^CentOS6- ]]; then - time yum install -y - coreutils curl diffutils grep gzip sed - bzip2 file findutils git openssh-clients openssl perl tar wget which xz - gcc gcc-c++ make valgrind - glibc-devel libstdc++-devel zlib-devel - glibc-devel.i686 libstdc++-devel.i686 zlib-devel.i686; - fi - - - if [[ $CI_BUILD_NAME =~ ^CentOS7- ]]; then - time yum install -y - coreutils curl diffutils grep gzip sed - bzip2 file findutils git openssh-clients openssl perl tar wget which xz - clang gcc gcc-c++ make valgrind - glibc-devel libasan libstdc++-devel zlib-devel - glibc-devel.i686 libasan.i686 libstdc++-devel.i686 zlib-devel.i686; - fi - - - if [[ $CI_BUILD_NAME =~ ^Fedora ]]; then - time dnf install -y --best --allowerasing - coreutils curl diffutils grep gzip sed - bzip2 file findutils git openssh-clients openssl perl tar wget which xz - clang gcc gcc-c++ lcov make valgrind - glibc-devel libasan libstdc++-devel libubsan zlib-devel - glibc-devel.i686 libasan.i686 libstdc++-devel.i686 libubsan.i686 zlib-devel.i686; - fi - - - if [[ $CI_BUILD_NAME =~ ^OpenSUSE42.2- ]]; then - time zypper update -y; - time zypper install -y - coreutils curl diffutils grep gzip sed - bzip2 file findutils git openssh openssl perl tar wget which xz - llvm-clang gcc gcc-32bit gcc-c++ gcc-c++-32bit lcov make valgrind - glibc-devel libstdc++-devel libz1 zlib-devel - glibc-devel-32bit libstdc++-devel-32bit libz1-32bit zlib-devel-32bit; - fi - - - if [[ $CI_BUILD_NAME =~ ^(Debian|Ubuntu) ]]; then - time apt-get -yq --no-install-suggests --no-install-recommends --force-yes upgrade; - time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install - build-essential ca-certificates curl file git openssh-client openssl wget xz-utils zlib1g-dev; - fi - - - if [[ $CI_BUILD_NAME =~ ^Ubuntu1604- ]]; then - time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install - g++-multilib - libstdc++-5-dev:i386 zlib1g-dev:i386 - libx32stdc++-5-dev libx32z1-dev; - fi - - - if [[ $CI_BUILD_NAME =~ ^Ubuntu1604-cross ]]; then - time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install - crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf - crossbuild-essential-powerpc crossbuild-essential-ppc64el crossbuild-essential-s390x - binutils-mingw-w64-i686 g++-mingw-w64-i686 - binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 - binutils-mips-linux-gnu g++-mips-linux-gnu - binutils-mipsel-linux-gnu g++-mipsel-linux-gnu - binutils-powerpc-linux-gnu g++-powerpc-linux-gnu - binutils-powerpc64-linux-gnu g++-powerpc64-linux-gnu - qemu-user qemu-utils wine; - fi - - git --version && bash --version - - umask 022; mkdir -p ../deps ../build/gitlab - - time git submodule update --init --recursive - - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -x --use-compress-program=xz - - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -x --use-compress-program=xz - - cd ../deps && time git clone https://github.com/upx/upx-testsuite - - | - if [[ $CI_BUILD_NAME =~ ^Fedora ]]; then - time dnf install -y --best --allowerasing python - cd ../deps && time wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20160918/bin-upx-20160918.tar.xz | tar -x --use-compress-program=xz - fi - - cd $CI_PROJECT_DIR; pwd - -CentOS5-gcc-m32+m64: # gcc-4.1 - image: centos:5 - script: - # patch src/Makefile for gcc-4.1 - - perl -i -p -e 's/ -Wmissing-declarations / /; s/ -Wvla / /;' src/Makefile - - time C=gcc-m32 bash ./.github/travis_build.sh - - time C=gcc-m64 bash ./.github/travis_build.sh - - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -CentOS6-gcc-m32+m64: # gcc-4.4 - image: centos:6 - script: - - time C=gcc-m32 bash ./.github/travis_build.sh - - time C=gcc-m64 bash ./.github/travis_build.sh - - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -CentOS7-clang+gcc-m32+m64: # clang-3.4, gcc-4.8 - image: centos:7 - script: - - time C=clang-m32 bash ./.github/travis_build.sh - - time C=gcc-m32 bash ./.github/travis_build.sh - - time C=clang-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh - - time C=clang-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -Debian7-gcc-m64: # gcc-4.7 - image: debian:7 - script: - - time C=gcc-4.7-m64 bash ./.github/travis_build.sh - - time C=gcc-4.7-m64 bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -Debian8-gcc-m64: # gcc-4.9 - image: debian:8 - script: - - time C=gcc-4.9-m64 bash ./.github/travis_build.sh - - time C=gcc-4.9-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-4.9-m64 bash ./.github/travis_deploy.sh - tags: [ shared ] - except: [ tags ] - -Fedora23-clang+gcc-m32+m64: # clang-3.7, gcc-5 - image: fedora:23 - script: - - time X=rebuild-stubs bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_build.sh - - time C=gcc-m32 bash ./.github/travis_build.sh - - time C=clang-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 B=sanitize bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh - - time C=clang-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 B=sanitize bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 T=valgrind bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -Fedora24-clang+gcc-m32+m64: # clang-3.8, gcc-6 - image: fedora:24 - script: - - time X=rebuild-stubs bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_build.sh - - time C=gcc-m32 bash ./.github/travis_build.sh - - time C=clang-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 B=sanitize bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh - - time C=clang-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 B=sanitize bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 T=valgrind bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -Fedora25-clang+gcc-m32+m64: # clang-3.8, gcc-6 - image: fedora:25 - script: - - time X=rebuild-stubs bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_build.sh - - time C=gcc-m32 bash ./.github/travis_build.sh - - time C=clang-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 bash ./.github/travis_build.sh - - time C=gcc-m64 B=sanitize bash ./.github/travis_build.sh - - time C=clang-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh - - time C=clang-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 B=sanitize bash ./.github/travis_testsuite_1.sh - - time C=gcc-m64 T=valgrind bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -OpenSUSE42.2-clang+gcc-m32+m64: # clang-3.8, gcc-4.8 - image: opensuse:42.2 - script: - - time C=clang-m64 bash ./.github/travis_build.sh - - time C=gcc-4.8-m32 bash ./.github/travis_build.sh - - time C=gcc-4.8-m64 bash ./.github/travis_build.sh - - time C=clang-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-4.8-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-4.8-m64 bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -Ubuntu1204-gcc-m64: # gcc-4.6 - image: ubuntu:12.04 - script: - - time C=gcc-4.6-m64 bash ./.github/travis_build.sh - - time C=gcc-4.6-m64 bash ./.github/travis_testsuite_1.sh - tags: [ shared ] - except: [ tags ] - -Ubuntu1404-gcc-m64: # gcc-4.8 - image: ubuntu:14.04 - script: - - time C=gcc-4.8-m64 bash ./.github/travis_build.sh - - time C=gcc-4.8-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-4.8-m64 bash ./.github/travis_deploy.sh - tags: [ shared ] - except: [ tags ] - -Ubuntu1604-gcc-m32+m64: # gcc-5 - image: ubuntu:16.04 - script: - - time C=gcc-5-m32 bash ./.github/travis_build.sh - - time C=gcc-5-m64 bash ./.github/travis_build.sh - - time C=gcc-5-m32 bash ./.github/travis_testsuite_1.sh - - time C=gcc-5-m64 bash ./.github/travis_testsuite_1.sh - - time C=gcc-5-m32 bash ./.github/travis_deploy.sh - - time C=gcc-5-m64 bash ./.github/travis_deploy.sh - tags: [ shared ] - except: [ tags ] - -Ubuntu1604-cross: # gcc-5 - image: ubuntu:16.04 - script: - - time CROSS=aarch64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=arm-linux-gnueabi C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=arm-linux-gnueabihf C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=i686-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_build.sh - - time CROSS=mips-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=mipsel-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=powerpc-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=powerpc64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=s390x-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh - - time CROSS=x86_64-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_build.sh - - time CROSS=aarch64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh - - time CROSS=arm-linux-gnueabi C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh - - time CROSS=arm-linux-gnueabihf C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh -# - time CROSS=i686-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_testsuite_1.sh -# - time CROSS=mips-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh - - time CROSS=mipsel-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh -# - time CROSS=powerpc-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh -# - time CROSS=powerpc64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh -# - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh -# - time CROSS=s390x-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh -# - time CROSS=x86_64-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_testsuite_1.sh - - time CROSS=aarch64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=arm-linux-gnueabi C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=arm-linux-gnueabihf C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=i686-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_deploy.sh - - time CROSS=mips-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=mipsel-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=powerpc-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=powerpc64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=s390x-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh - - time CROSS=x86_64-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_deploy.sh - tags: [ shared ] - except: [ tags ] - -# vim:set ts=2 sw=2 et: diff --git a/.travis.yml b/.travis.yml index 58b75ba2..ed94a6db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,7 @@ sudo: false language: cpp -notifications: - email: - on_success: never - on_failure: change +notifications: { email: { on_success: never, on_failure: change } } .ubuntu_toolchain_sources: &S - ubuntu-toolchain-r-test @@ -74,12 +71,12 @@ matrix: compiler: gcc env: C=gcc-4.8-m64 addons: { apt: { sources: *S, 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", "libx32z1-dev" ] } } + - os: linux + sudo: required + dist: trusty + compiler: gcc + env: C=gcc-4.8-mx32 T=SKIP + addons: { apt: { packages: [ "g++-multilib", "libx32stdc++-4.8-dev" ] } } - os: linux compiler: gcc env: C=gcc-4.9-m32 @@ -250,9 +247,6 @@ install: fi script: - - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_build.sh - - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_testsuite_1.sh -after_success: - - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_deploy.sh + - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_build.sh && bash ./.github/travis_testsuite_1.sh && bash ./.github/travis_deploy.sh # vim:set ts=2 sw=2 et: