| Message ID | 20210203113243.280883-4-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Move remaining x86 Travis jobs to the gitlab-CI | expand |
On 2/3/21 8:32 AM, Thomas Huth wrote: > Simply add the flag to an existing job, no need for yet another > job here. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > .gitlab-ci.yml | 1 + > .travis.yml | 6 ------ > 2 files changed, 1 insertion(+), 6 deletions(-) Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 41e11b41e4..4654798523 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -223,6 +223,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 d1e9016da5..45dd017420 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -132,12 +132,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)"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41e11b41e4..4654798523 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,6 +223,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 d1e9016da5..45dd017420 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,12 +132,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)"
Simply add the flag to an existing job, no need for yet another job here. Signed-off-by: Thomas Huth <thuth@redhat.com> --- .gitlab-ci.yml | 1 + .travis.yml | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-)