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

[GitLab Mirror]

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

New commits:
commit 153e408f9f80ffb17f867e34a4eea42348f17ba1
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 19 12:03:48 2020 +0000

    ci: Minor command simplification
    
    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 7565b67d..02ba6f77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,8 +144,7 @@ makecheck-windows:
     mingw64-gstreamer1-plugins-base mingw64-gstreamer1-plugins-good mingw64-orc
     meson
   - mkdir spice-protocol/build
-  - (cd spice-protocol/build && mingw64-meson --werror)
-  - ninja -C spice-protocol/build install
+  - (cd spice-protocol/build && mingw64-meson --werror && ninja install)
   - NOCONFIGURE=yes ./autogen.sh
   - mingw64-configure
   - mingw64-make
commit cf94bdffa61d1e4dd8f4cdc2dad0fbf491add22a
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 19 12:03:29 2020 +0000

    ci: Use --werror for Meson
    
    We want to get rid of warnings
    
    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 7127c173..7565b67d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ meson-makecheck:
   - >
     CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     LDFLAGS='-fsanitize=address -lasan'
-    meson --buildtype=release build || (cat build/meson-logs/meson-log.txt && exit 1)
+    meson --buildtype=release --werror 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)
 
@@ -56,7 +56,7 @@ options:
 
 meson-options:
   script:
-  - meson --buildtype=release -Dstatistics=true -Dsasl=false build
+  - meson --buildtype=release --werror -Dstatistics=true -Dsasl=false build
   - ninja -C build
   - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
 
@@ -129,7 +129,7 @@ makecheck-debian32:
   - >
     CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     LDFLAGS='-fsanitize=address -lasan'
-    meson --buildtype=release build || (cat build/meson-logs/meson-log.txt && exit 1)
+    meson --buildtype=release --werror 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)
 
commit a6c9e499fda1c25f82bcf9d82b33a20abe1ec3b8
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 19 12:02:56 2020 +0000

    ci: Reuse code to install newer spice-protocol
    
    Avoid duplications for these commands
    
    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 f85b56ab..7127c173 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,10 +10,11 @@ before_script:
     gstreamer1-devel gstreamer1-plugins-base-devel
     dconf
     -y
-  - git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git}
-  - meson --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror
-  - ninja -C build-spice-protocol install
-  - rm -rf build-spice-protocol
+  - &protocol >
+    git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git} &&
+    meson --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror &&
+    ninja -C build-spice-protocol install &&
+    rm -rf build-spice-protocol
   # This is a workaround for Fedora docker image, this will add some
   # missing configuration
   # '/org/gnome/system/location/enabled' is just the first key path
@@ -97,9 +98,7 @@ makecheck-centos:
       git-core python3-pyparsing python3-six python3
       meson
       -y
-    - git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git}
-    - meson --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror
-    - ninja -C build-spice-protocol install
+    - *protocol
   image: centos:latest
   script:
   - >
@@ -124,9 +123,7 @@ makecheck-debian32:
       libjpeg-dev liblz4-dev libopus-dev libpixman-1-dev libsasl2-dev
       libspice-protocol-dev libssl-dev pkg-config
       python3-six python3-pyparsing liborc-0.4-dev meson git
-    - git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git}
-    - meson --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror
-    - ninja -C build-spice-protocol install
+    - *protocol
   image: i386/debian:latest
   script:
   - >
commit e9dabf7c8957809daa45412ea6efc1761f766995
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 19 12:01:51 2020 +0000

    ci: Remove useless command
    
    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 fb299456..f85b56ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,6 @@ makecheck:
     ../autogen.sh
   - make
   - make -C server check || (cat server/tests/test-suite.log && exit 1)
-  - cd ..
 
 meson-makecheck:
   script: