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

[GitLab Mirror]

 .gitlab-ci.yml |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4a1e9a03f45770e29770b2eea3d996eb2972599c
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Sat Jan 29 16:48:50 2022 +0000

    ci: Workaround a bug in Fedora 35 mingw64-make script
    
    mingw64-make is a bash script that wraps make command passing
    additional arguments and setup in order to cross compiler for
    MingW (to target Windows).
    In Fedora 35 the script passes the arguments we provide
    twice. So if we pass (like in this case)
    "LOG_COMPILE=wine -C server check" the final make command will
    receive
    "LOG_COMPILE=wine -C server check LOG_COMPILE=wine -C server check"
    arguments.
    This for some arguments it's not a problem but passing "-C <dir>"
    twice causes make to attempt to change directory twice.
    This causes a
    
        make: *** server: No such file or directory.  Stop.
    
    error. Use cd command before invoking mingw64-make to avoid
    having to pass "-C" option.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a36d012c..844e1691 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -162,7 +162,7 @@ makecheck-windows:
   - mingw64-make
   - export G_TLS_GNUTLS_PRIORITY="NORMAL:%COMPAT"
   - export WINEPATH='Z:\usr\x86_64-w64-mingw32\sys-root\mingw\bin'
-  - mingw64-make LOG_COMPILE=wine -C server check || (cat server/tests/test-suite.log && exit 1)
+  - (cd server && exec mingw64-make LOG_COMPILE=wine check) || (cat server/tests/test-suite.log && exit 1)
 
 websocket-autobahn:
   before_script:
commit a73b82fc18af9b3e11f2808de54fbcc8d57cc250
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Thu Nov 11 09:58:06 2021 +0000

    ci: Set WINEPATH before executing tests for Windows
    
    Without it on Fedora 35 Wine is not able to find DLLs installed
    on the system.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f8a68b8..a36d012c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,6 +161,7 @@ makecheck-windows:
   - mingw64-configure
   - mingw64-make
   - export G_TLS_GNUTLS_PRIORITY="NORMAL:%COMPAT"
+  - export WINEPATH='Z:\usr\x86_64-w64-mingw32\sys-root\mingw\bin'
   - mingw64-make LOG_COMPILE=wine -C server check || (cat server/tests/test-suite.log && exit 1)
 
 websocket-autobahn: