Revert "Use qemu 4.0.0 for cross-arch CI"

This reverts commit 9e7fa9b859.
CI had some unexpected results with this new version overnight. As a
result and until I investigate this, let go back to 3.1.0.
This commit is contained in:
Paulo Matos 2019-05-01 07:38:48 +02:00
parent f3de3e4584
commit 2cbc07cab2

View File

@ -188,19 +188,19 @@ prepare-cache:qemu:
script: script:
- if [ -d $INSTALL_DIR ]; then exit 0; fi - if [ -d $INSTALL_DIR ]; then exit 0; fi
- apt-get update && apt-get install -y gcc make bison flex git wget xz-utils python pkg-config libglib2.0-dev libpixman-1-dev - apt-get update && apt-get install -y gcc make bison flex git wget xz-utils python pkg-config libglib2.0-dev libpixman-1-dev
- wget https://download.qemu.org/qemu-4.0.0.tar.xz - wget https://download.qemu.org/qemu-3.1.0.tar.xz
- tar -xvJf qemu-4.0.0.tar.xz - tar -xvJf qemu-3.1.0.tar.xz
- mkdir qemu-build - mkdir qemu-build
- cd qemu-build - cd qemu-build
- ../qemu-4.0.0/configure --static --disable-kvm --disable-xen --disable-spice --target-list='i386-linux-user aarch64-linux-user arm-linux-user mips-linux-user mipsel-linux-user mips64el-linux-user s390x-linux-user ppc64le-linux-user riscv64-linux-user' --prefix=$INSTALL_DIR - ../qemu-3.1.0/configure --static --disable-kvm --disable-xen --disable-spice --target-list='i386-linux-user aarch64-linux-user arm-linux-user mips-linux-user mipsel-linux-user mips64el-linux-user s390x-linux-user ppc64le-linux-user riscv64-linux-user' --prefix=$INSTALL_DIR
- make -j5 - make -j5
- make -j5 install - make -j5 install
cache: cache:
key: qemu-4.0.0 key: qemu-3.1.0
paths: paths:
- $INSTALL_DIR - $INSTALL_DIR
artifacts: artifacts:
name: "qemu-4.0.0" name: "qemu-3.1.0"
paths: paths:
- $INSTALL_DIR - $INSTALL_DIR
expire_in: 1 week expire_in: 1 week