From 3382261c26d05a3c93977f9a8d7974faf60bcd31 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 11 Feb 2021 12:27:38 +0000 Subject: [PATCH] travis.yml: Move the --enable-modules test to the gitlab-CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simply add the flag to an existing job, no need for yet another job here. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210211045455.456371-4-thuth@redhat.com> Message-Id: <20210211122750.22645-4-alex.bennee@linaro.org> --- .gitlab-ci.yml | 1 + .travis.yml | 6 ------ 2 files changed, 1 insertion(+), 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)"