Patchwork [v1,15/19] travis: remove matrix settings that duplicate global settings

login
register
mail settings
Submitter Alex Bennée
Date Jan. 10, 2019, 5:45 p.m.
Message ID <20190110174516.21586-16-alex.bennee@linaro.org>
Download mbox | patch
Permalink /patch/697105/
State New
Headers show

Comments

Alex Bennée - Jan. 10, 2019, 5:45 p.m.
From: Daniel P. Berrangé <berrange@redhat.com>

The global defaults request "trusty" and "gcc", so matrix entries do not
need to repeat this.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)
Philippe Mathieu-Daudé - Jan. 10, 2019, 6:06 p.m.
On 1/10/19 6:45 PM, Alex Bennée wrote:
> From: Daniel P. Berrangé <berrange@redhat.com>
> 
> The global defaults request "trusty" and "gcc", so matrix entries do not
> need to repeat this.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  .travis.yml | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 39dbda7a0b..79da3a495a 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -128,39 +128,33 @@ matrix:
>          - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
>        after_success:
>          - ${SRC_DIR}/scripts/travis/coverage-summary.sh
> -      compiler: gcc
>  
>  
>      # We manually include builds which we disable "make check" for
>      - env:
>          - CONFIG="--enable-debug --enable-tcg-interpreter"
>          - TEST_CMD=""
> -      compiler: gcc
>  
>  
>      # We don't need to exercise every backend with every front-end
>      - env:
>          - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
>          - TEST_CMD=""
> -      compiler: gcc
>  
>  
>      - env:
>          - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
>          - TEST_CMD=""
> -      compiler: gcc
>  
>  
>      - env:
>          - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
>          - TEST_CMD=""
> -      compiler: gcc
>  
>  
>      - env:
>          - CONFIG="--disable-tcg"
>          - TEST_CMD=""
> -      compiler: gcc
>  
>  
>      # MacOSX builds
> @@ -251,5 +245,3 @@ matrix:
>      - env:
>          - CONFIG="--disable-system --disable-docs"
>          - TEST_CMD="make -j3 check-tcg V=1"
> -      dist: trusty
> -      compiler: gcc
>

Patch

diff --git a/.travis.yml b/.travis.yml
index 39dbda7a0b..79da3a495a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,39 +128,33 @@  matrix:
         - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
       after_success:
         - ${SRC_DIR}/scripts/travis/coverage-summary.sh
-      compiler: gcc
 
 
     # We manually include builds which we disable "make check" for
     - env:
         - CONFIG="--enable-debug --enable-tcg-interpreter"
         - TEST_CMD=""
-      compiler: gcc
 
 
     # We don't need to exercise every backend with every front-end
     - env:
         - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
         - TEST_CMD=""
-      compiler: gcc
 
 
     - env:
         - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
         - TEST_CMD=""
-      compiler: gcc
 
 
     - env:
         - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
         - TEST_CMD=""
-      compiler: gcc
 
 
     - env:
         - CONFIG="--disable-tcg"
         - TEST_CMD=""
-      compiler: gcc
 
 
     # MacOSX builds
@@ -251,5 +245,3 @@  matrix:
     - env:
         - CONFIG="--disable-system --disable-docs"
         - TEST_CMD="make -j3 check-tcg V=1"
-      dist: trusty
-      compiler: gcc