summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-08 17:27:53 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-08 17:27:53 +0000
commitf6d81cdec807bb85325afedb536b17c5331483c7 (patch)
tree973cfd3dfe2098ceee4b86c293a4835e74fe2859
parent83d2e94cba776c02c761a5d14b5c2504796a8c0a (diff)
parentb2dba411cf5afc6771e0dd9900fa2b5031a686ac (diff)
downloadfocaccia-qemu-f6d81cdec807bb85325afedb536b17c5331483c7.tar.gz
focaccia-qemu-f6d81cdec807bb85325afedb536b17c5331483c7.zip
Merge remote-tracking branch 'remotes/stsquad/tags/pull-shippable-disable-ppc-080318-1' into staging
One fix to disable broken ppc cross-compile test on shippable

# gpg: Signature made Thu 08 Mar 2018 15:00:23 GMT
# gpg:                using RSA key FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-shippable-disable-ppc-080318-1:
  .shippable.yml: disable powerpc-cross image

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--.shippable.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.shippable.yml b/.shippable.yml
index dd4bbc84b1..60f2ce9218 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -23,8 +23,6 @@ env:
       TARGET_LIST=mips-softmmu,mipsel-linux-user
     - IMAGE=debian-mips64el-cross
       TARGET_LIST=mips64el-softmmu,mips64el-linux-user
-    - IMAGE=debian-powerpc-cross
-      TARGET_LIST=ppc-softmmu,ppcemb-softmmu,ppc-linux-user
     - IMAGE=debian-ppc64el-cross
       TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
 build: