Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
.gitlab-ci.yml | 7 +++++++
.travis.yml | 8 --------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21b01c0547..878d114d40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -434,6 +434,13 @@ build-trace-ust-system:
IMAGE: ubuntu2004
CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu
+# Check our reduced build configurations
+build-without-default-devices:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: debian-amd64
+ CONFIGURE_ARGS: --without-default-devices --disable-user
+
check-patch:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
diff --git a/.travis.yml b/.travis.yml
index 1f80bdb624..e89996c111 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -224,14 +224,6 @@ jobs:
- ${SRC_DIR}/scripts/travis/coverage-summary.sh
- # We manually include builds which we disable "make check" for
- - name: "GCC without-default-devices (softmmu)"
- env:
- - CONFIG="--without-default-devices --disable-user"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
- - TEST_CMD=""
-
-
# Using newer GCC with sanitizers
- name: "GCC9 with sanitizers (softmmu)"
dist: bionic
--
2.20.1
