diff mbox series

[v1,7/7] shippable: re-enable the windows cross builds

Message ID 20190712111849.9006-8-alex.bennee@linaro.org
State Superseded
Headers show
Series testing/next (docker, win-cross) | expand

Commit Message

Alex Bennée July 12, 2019, 11:18 a.m. UTC
The pkg.mxe.cc repo has been restored.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 .shippable.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé July 13, 2019, 3:01 p.m. UTC | #1
On 7/12/19 1:18 PM, Alex Bennée wrote:
> The pkg.mxe.cc repo has been restored.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  .shippable.yml | 9 ++++-----

>  1 file changed, 4 insertions(+), 5 deletions(-)

> 

> diff --git a/.shippable.yml b/.shippable.yml

> index f2ffef21d11..f74a3de3ffd 100644

> --- a/.shippable.yml

> +++ b/.shippable.yml

> @@ -7,11 +7,10 @@ env:

>    matrix:

>      - IMAGE=debian-amd64

>        TARGET_LIST=x86_64-softmmu,x86_64-linux-user

> -    # currently disabled as the mxe.cc repos are down

> -    # - IMAGE=debian-win32-cross

> -    #   TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu

> -    # - IMAGE=debian-win64-cross

> -    #   TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu

> +    - IMAGE=debian-win32-cross

> +      TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu

> +    - IMAGE=debian-win64-cross

> +      TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu

>      - IMAGE=debian-armel-cross

>        TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user

>      - IMAGE=debian-armhf-cross

> 


Builds now take ~25min longer. The win32 build is definitively helpful
and should catch most of the errors the win64 could find. I suggest we
build the docker image but not cross-compile on win64. Anyway this can
be improved later.

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

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff mbox series

Patch

diff --git a/.shippable.yml b/.shippable.yml
index f2ffef21d11..f74a3de3ffd 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -7,11 +7,10 @@  env:
   matrix:
     - IMAGE=debian-amd64
       TARGET_LIST=x86_64-softmmu,x86_64-linux-user
-    # currently disabled as the mxe.cc repos are down
-    # - IMAGE=debian-win32-cross
-    #   TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu
-    # - IMAGE=debian-win64-cross
-    #   TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu
+    - IMAGE=debian-win32-cross
+      TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu
+    - IMAGE=debian-win64-cross
+      TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu
     - IMAGE=debian-armel-cross
       TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
     - IMAGE=debian-armhf-cross