diff options
author | Alex Bennée <alex.bennee@linaro.org> | 2020-12-10 19:04:15 +0000 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-02 21:03:09 +0100 |
commit | 3fed93f312a8898ff391575748bdac240b477d0b (patch) | |
tree | 58446346f13ee416b93466814829ca4da9b028bf | |
parent | afded359a6c413d5dab68b1b1c692d8efc196eaa (diff) | |
download | qemu-3fed93f312a8898ff391575748bdac240b477d0b.zip qemu-3fed93f312a8898ff391575748bdac240b477d0b.tar.gz qemu-3fed93f312a8898ff391575748bdac240b477d0b.tar.bz2 |
gitlab: move --without-default-devices build from Travis
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201210190417.31673-7-alex.bennee@linaro.org>
-rw-r--r-- | .gitlab-ci.yml | 7 | ||||
-rw-r--r-- | .travis.yml | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf3df84..373d808 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -519,6 +519,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: centos8 + 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 d01714a..f2a1019 100644 --- a/.travis.yml +++ b/.travis.yml @@ -205,14 +205,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 |