[Spice-commits] 2 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit cf5a336d9b0730e7075b4b511914b45933cdc431
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Apr 1 09:03:44 2020 +0100

    ci: Use a single job
    
    Reduce CI resource usage using a single job instead of 2.
    The project is pretty small and the setup of the 2 jobs is pretty
    long compared to the build so using a single job (we used the same
    container image for both) reduce CI resource usage.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 881282b..e1afe6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,14 +11,12 @@ before_script:
   - dnf install -y $DEPS_COMMON
   - autoreconf -if
 
-fedora-mingw32:
-  script:
-  - mingw32-configure
-  - mingw32-make
-  - mingw32-make check
-
-fedora-mingw64:
+fedora-mingw:
   script:
   - mingw64-configure
   - mingw64-make
   - mingw64-make check
+  - make distclean
+  - mingw32-configure
+  - mingw32-make
+  - mingw32-make check
commit 0d0df5681b179c5dc7767f6fa125a7ca57c92c39
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Sun Mar 22 06:46:38 2020 +0000

    ci: Fix repositories updates
    
    Force sync and update of all git submodules.
    Do not install packaged spice-protocol, we are using submodule.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bd30ea..881282b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,14 +2,14 @@ image: fedora:latest
 
 variables:
   DEPS_COMMON: git libtool make ImageMagick
-      wine-core.x86_64 wine-core.i686 mingw32-spice-protocol mingw64-spice-protocol
+      wine-core.x86_64 wine-core.i686
       mingw32-libpng-static mingw32-zlib-static mingw32-gcc-c++ mingw32-winpthreads-static
       mingw64-libpng-static mingw64-zlib-static mingw64-gcc-c++ mingw64-winpthreads-static
+  GIT_SUBMODULE_STRATEGY: recursive
 
 before_script:
   - dnf install -y $DEPS_COMMON
   - autoreconf -if
-  - git submodule update --init --recursive
 
 fedora-mingw32:
   script: