aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2018-09-27 08:15:16 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-09-27 08:45:41 +0200
commit3786db4cdf86bacc4f25a283f5d5b9760e047e22 (patch)
treeecdc442f3198fe5fa4422997588bc514ecb1a108
parent9cf341bad3b88d21c1b6d7cd3d790956c8ad105e (diff)
downloadlibssh-3786db4cdf86bacc4f25a283f5d5b9760e047e22.tar.gz
libssh-3786db4cdf86bacc4f25a283f5d5b9760e047e22.tar.xz
libssh-3786db4cdf86bacc4f25a283f5d5b9760e047e22.zip
gitlab-ci: Get build and test errors from mingw
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--.gitlab-ci.yml18
1 files changed, 8 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea565c7b..0d763154 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,16 +154,15 @@ fedora/mbedtls/x86_64:
fedora/mingw64:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
script:
- - Xvfb :1 -screen 0 1024x768x16 -ac +extension GLX +render -noreset -nolisten tcp &
- - export DISPLAY=:1
+ - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
+ - export WINEDEBUG=-all
- mkdir -p obj && cd obj && mingw64-cmake
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DPICKY_DEVELOPER=ON
-DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON --DWITH_PCAP=ON
-DUNIT_TESTING=ON .. &&
- make -j$(nproc)
- - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
- - ctest --output-on-failure
+ make -j$(nproc) &&
+ ctest --output-on-failure
tags:
- shared
except:
@@ -179,16 +178,15 @@ fedora/mingw64:
fedora/mingw32:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
script:
- - Xvfb :1 -screen 0 1024x768x16 -ac +extension GLX +render -noreset -nolisten tcp &
- - export DISPLAY=:1
+ - export WINEPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin
+ - export WINEDEBUG=-all
- mkdir -p obj && cd obj && mingw32-cmake
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DPICKY_DEVELOPER=ON
-DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON --DWITH_PCAP=ON
-DUNIT_TESTING=ON .. &&
- make -j$(nproc)
- - export WINEPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin
- - ctest --output-on-failure
+ make -j$(nproc) &&
+ ctest --output-on-failure
tags:
- shared
except: