diff mbox

[v2,1/4] .travis.yml: add more linux-user to the build matrix

Message ID 1411553636-24717-2-git-send-email-alex.bennee@linaro.org
State Superseded
Headers show

Commit Message

Alex Bennée Sept. 24, 2014, 10:13 a.m. UTC 
At the same time I've grouped the $ARCH-linux-user and $ARCH-softmmu
builds together (hoping FS cache helps) and grouped all $ARCH-softmmu
only builds into one target. This reduces the build matrix slightly
which will hopefully help with build times.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alexander Graf <agraf@suse.de>

Comments

Brian Jackson Sept. 24, 2014, 3:08 p.m. UTC | #1 
On Wednesday, September 24, 2014 11:13:53 AM Alex Bennée wrote:
> At the same time I've grouped the $ARCH-linux-user and $ARCH-softmmu
> builds together (hoping FS cache helps) and grouped all $ARCH-softmmu
> only builds into one target. This reduces the build matrix slightly
> which will hopefully help with build times.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Alexander Graf <agraf@suse.de>

Reviewed-by: Brian Jackson <iggy@theiggy.com>

> 
> diff --git a/.travis.yml b/.travis.yml
> index 89c30ae..72cfc9f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -20,23 +20,23 @@ env:
>      - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev
> libpixman-1-dev" - EXTRA_PKGS=""
>    matrix:
> +    # Group major targets together with their linux-user counterparts
>      - TARGETS=alpha-softmmu,alpha-linux-user
> -    - TARGETS=arm-softmmu,arm-linux-user
> -    - TARGETS=aarch64-softmmu,aarch64-linux-user
> -    - TARGETS=cris-softmmu
> -    - TARGETS=i386-softmmu,x86_64-softmmu
> -    - TARGETS=lm32-softmmu
> -    - TARGETS=m68k-softmmu
> -    - TARGETS=microblaze-softmmu,microblazeel-softmmu
> +    -
> TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64
> -linux-user +    - TARGETS=cris-softmmu,cris-linux-user
> +    - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
> +    - TARGETS=m68k-softmmu,m68k-linux-user
> +    -
> TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,micro
> blazeel-linux-user -
> TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu -    -
> TARGETS=moxie-softmmu
> -    - TARGETS=or32-softmmu,
> -    - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu
> -    - TARGETS=s390x-softmmu
> -    - TARGETS=sh4-softmmu,sh4eb-softmmu
> -    - TARGETS=sparc-softmmu,sparc64-softmmu
> -    - TARGETS=unicore32-softmmu
> -    - TARGETS=xtensa-softmmu,xtensaeb-softmmu
> +    -
> TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-
> user,mipsn32-linux-user,mipsn32el-linux-user +    -
> TARGETS=or32-softmmu,or32-linux-user
> +    -
> TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux
> -user,ppc64abi32-linux-user,ppc64le-linux-user +    -
> TARGETS=s390x-softmmu,s390x-linux-user
> +    - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user
> +    -
> TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-us
> er,sparc64-linux-user +    - TARGETS=unicore32-softmmu,unicore32-linux-user
> +    # Group remaining softmmu only targets into one build
> +    -
> TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-
> softmmu before_install:
>    - git submodule update --init --recursive
>    - sudo apt-get update -qq
diff mbox

Patch

diff --git a/.travis.yml b/.travis.yml
index 89c30ae..72cfc9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,23 +20,23 @@  env:
     - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev"
     - EXTRA_PKGS=""
   matrix:
+    # Group major targets together with their linux-user counterparts
     - TARGETS=alpha-softmmu,alpha-linux-user
-    - TARGETS=arm-softmmu,arm-linux-user
-    - TARGETS=aarch64-softmmu,aarch64-linux-user
-    - TARGETS=cris-softmmu
-    - TARGETS=i386-softmmu,x86_64-softmmu
-    - TARGETS=lm32-softmmu
-    - TARGETS=m68k-softmmu
-    - TARGETS=microblaze-softmmu,microblazeel-softmmu
+    - TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user
+    - TARGETS=cris-softmmu,cris-linux-user
+    - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
+    - TARGETS=m68k-softmmu,m68k-linux-user
+    - TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
     - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu
-    - TARGETS=moxie-softmmu
-    - TARGETS=or32-softmmu,
-    - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu
-    - TARGETS=s390x-softmmu
-    - TARGETS=sh4-softmmu,sh4eb-softmmu
-    - TARGETS=sparc-softmmu,sparc64-softmmu
-    - TARGETS=unicore32-softmmu
-    - TARGETS=xtensa-softmmu,xtensaeb-softmmu
+    - TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
+    - TARGETS=or32-softmmu,or32-linux-user
+    - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
+    - TARGETS=s390x-softmmu,s390x-linux-user
+    - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user
+    - TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user
+    - TARGETS=unicore32-softmmu,unicore32-linux-user
+    # Group remaining softmmu only targets into one build
+    - TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
 before_install:
   - git submodule update --init --recursive
   - sudo apt-get update -qq