> >
> > From: Victor Toso <me@xxxxxxxxxxxxxx>
> >
> > Group by target build instead of command. The focus of each job is to
> > check any regression for given platform, using 'fedora'/'windows' and
> > 'autotools'/'meson' seems more intuitive.
> >
> > By doing that we are grouping similar jobs together, this is
> > intentional as we are reducing the amount of jobs that need to be run
> > (together with the whole bootstrapping) without losing logs or tests.
> >
> > Some indentation takes place too, keeping it to 2 spaces as some other
> > places in the code
> >
>
> Looking at the code I suppose you mean 4 not 2 in the last sentence.
>
Ok, I got his, there are 2 levels so the 4 spaces below..
> > Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx>
> > ---
> > .gitlab-ci.yml | 62 ++++++++++++++++++++++++--------------------------
> > 1 file changed, 30 insertions(+), 32 deletions(-)
> >
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index 74280e9..aab5f77 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -16,41 +16,39 @@ before_script:
> > - git clone ${CI_REPOSITORY_URL/spice-gtk/spice-protocol}
> > - (cd spice-protocol && ./autogen.sh --prefix=/usr && make install)
> >
> > -makecheck:
> > +fedora-autotools:
> > script:
> > - - ./autogen.sh --enable-static
> > - - make -j4
> > - - make check
> > + # Run with default options
> > + - ./autogen.sh --enable-static
> > + - make -j4
> > + - make check
> > + # Run without features
> > + - git clean -xfd
> > + - ./autogen.sh --enable-static
> > + --enable-lz4=no
> > + --enable-webdav=no
> > + --with-sasl=no
> > + --with-coroutine=auto
> > + --enable-pulse=no
> > + --enable-smartcard=no
> > + --enable-usbredir=no
> > + - make -j4
> > + - make check
> >
> > -makecheck-meson:
> > +fedora-meson:
> > script:
> > - - meson build || (cat build/meson-logs/meson-log.txt && exit 1)
> > - - ninja -C build
> > - - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit
> > 1)
> > + - meson _build_default || (cat _build_default/meson-logs/meson-log.txt
> > && exit 1)
>
> Why the change to _build_default instead of build?
> I suppose to group them but why the initial underscore?
> Why not deleting the directory every time to reduce disk space?
>
I got also the multiple directories, in the last patch you same the logs
as artifacts!
But still I don't get the initial underscore.
Also would be better to use dash instead to have build-spice-protocol
and not build_spice-protocol.
> > + - ninja -C _build_default
> > + - ninja -C _build_default test || (cat
> > _build_default/meson-logs/testlog.txt && exit 1)
> >
> > -makecheck_simple:
> > - script:
> > - - ./autogen.sh --enable-static
> > - --enable-lz4=no
> > - --enable-webdav=no
> > - --with-sasl=no
> > - --with-coroutine=auto
> > - --enable-pulse=no
> > - --enable-smartcard=no
> > - --enable-usbredir=no
> > - - make -j4
> > - - make check
> > -
> > -makecheck_simple-meson:
> > - script:
> > - - meson build -Dauto_features=disabled || (cat
> > build/meson-logs/meson-log.txt && exit 1)
> > - - ninja -C build
> > - - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit
> > 1)
> > + - meson _build_feat_disabled -Dauto_features=disabled || (cat
> > _build_feat_disabled/meson-logs/meson-log.txt && exit 1)
> > + - ninja -C _build_feat_disabled
> > + - ninja -C _build_feat_disabled test || (cat
> > _build_feat_disabled/meson-logs/testlog.txt && exit 1)
> >
> > -make-win:
> > +windows-autotools:
> > script:
> > - - dnf install -y mingw64-gcc mingw64-pkg-config mingw64-pixman
> > mingw64-openssl mingw64-gtk3 mingw64-json-glib mingw64-opus
> > mingw64-gstreamer1-plugins-base mingw64-gstreamer1-plugins-good
> > - - (cd spice-protocol && make clean && mingw64-configure --prefix=/usr &&
> > make install)
> > - - NOCONFIGURE=yes ./autogen.sh
> > - - PYTHON=python3 mingw64-configure --enable-static
> > - - make -j4
> > + - dnf install -y mingw64-gcc mingw64-pkg-config mingw64-pixman
> > mingw64-openssl mingw64-gtk3 mingw64-json-glib mingw64-opus
> > mingw64-gstreamer1-plugins-base mingw64-gstreamer1-plugins-good
> > + - (cd spice-protocol && make clean && mingw64-configure --prefix=/usr
> > &&
> > make install)
> > + - NOCONFIGURE=yes ./autogen.sh
> > + - PYTHON=python3 mingw64-configure --enable-static
> > + - make -j4
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel