diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-02-11 12:27:38 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2021-02-15 09:38:26 +0000 |
| commit | 3382261c26d05a3c93977f9a8d7974faf60bcd31 (patch) | |
| tree | 61bece7e3e596e124662f6d943251e8b80e41bc2 | |
| parent | c2b33c43fd6f65897adbf5209dbc08ee5cb6d47e (diff) | |
| download | focaccia-qemu-3382261c26d05a3c93977f9a8d7974faf60bcd31.tar.gz focaccia-qemu-3382261c26d05a3c93977f9a8d7974faf60bcd31.zip | |
travis.yml: Move the --enable-modules test to the gitlab-CI
Simply add the flag to an existing job, no need for yet another job here. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20210211045455.456371-4-thuth@redhat.com> Message-Id: <20210211122750.22645-4-alex.bennee@linaro.org>
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .travis.yml | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f3d42221a..da2fad1249 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,6 +222,7 @@ build-system-centos: variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system + --enable-modules TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build diff --git a/.travis.yml b/.travis.yml index 533a60c130..7744ec3a2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,12 +131,6 @@ jobs: - CONFIG="--enable-debug-tcg --disable-system" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - # Module builds are mostly of interest to major distros - - name: "GCC modules (main-softmmu)" - env: - - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" |