On Wed, Aug 11, 2021 at 08:20:37AM +0200, Philippe Mathieu-Daudé wrote: > On 8/10/21 4:06 PM, Daniel P. Berrangé wrote: > > The windows cross builds still take way too long in gitlab CI, so need > > more targets to be skipped. We don't want to hurt coverage of other > > cross builds more though, so we let jobs fine tune with a new env > > variale $CROSS_SKIP_TARGETS. > > > > We take the set of targets that are considered relatively niche or > > very old architectures, and skip approx half of them in win32 builds > > and the other half of them in win64. > > > > Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> > > --- > > .gitlab-ci.d/crossbuild-template.yml | 2 +- > > .gitlab-ci.d/crossbuilds.yml | 2 ++ > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/.gitlab-ci.d/crossbuild-template.yml > > b/.gitlab-ci.d/crossbuild-template.yml > > index cfb576b54c..10d22dcf6c 100644 > > --- a/.gitlab-ci.d/crossbuild-template.yml > > +++ b/.gitlab-ci.d/crossbuild-template.yml > > @@ -10,7 +10,7 @@ > > --disable-user --target-list-exclude="arm-softmmu cris-softmmu > > i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu > > mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu > > - sparc-softmmu xtensa-softmmu" > > + sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS" > > - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS > > - if grep -q "EXESUF=.exe" config-host.mak; > > then make installer; > > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > > index 4ff3aa3cfc..a5f9dbcbeb 100644 > > --- a/.gitlab-ci.d/crossbuilds.yml > > +++ b/.gitlab-ci.d/crossbuilds.yml > > @@ -160,6 +160,7 @@ cross-win32-system: > > job: win32-fedora-cross-container > > variables: > > IMAGE: fedora-win32-cross > > + CROSS_SKIP_TARGETS: or1k-softmmu rx-softmmu sh4eb-softmmu > > sparc64-softmmu tricore-softmmu xtensaeb-softmmu > > artifacts: > > paths: > > - build/qemu-setup*.exe > > @@ -170,6 +171,7 @@ cross-win64-system: > > job: win64-fedora-cross-container > > variables: > > IMAGE: fedora-win64-cross > > + CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu > > m68k-softmmu microblazeel-softmmu mips64el-softmmu nios2-softmmu > > It looks you inverted the lists. We expect more Win64 users, and these > are the targets of interest. I'd keep here (skipping in Win32):
I wouldn't say inverted, because the split was entirely arbitrary. While 32-bit vs 64-bit could conceivably show a difference, in practice those differences are likely to already be caught by non-windows builds. These jobs are most important for catching UNIX vs Windows differences, so in that view whether a target is built for win32 vs win64 doesn't matter. > > alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu > mips64el-softmmu sparc64-softmmu > > And skip (keep them in win32): > > or1k-softmmu rx-softmmu sh4eb-softmmu nios2-softmmu tricore-softmmu > xtensaeb-softmmu Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
