gitlab-ci: group and rename jobs

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

v1 -> v2:
- Remove initial '_' from build folder filenames (Frediano);
- Always use '-' instead of '_' in build folder filenames (Frediano);

Signed-off-by: Victor Toso <victortoso@redhat.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>

1 files changed, 30 insertions, 32 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74280e9..0c62c74 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)
+    - 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