[Spice-commits] 5 commits - build-aux/meson-dist build-aux/meson-win-wrapper.txt .gitlab-ci.yml server/tests
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed May 31 07:44:10 UTC 2023
.gitlab-ci.yml | 40 ++++++++++++++++++++--------------------
build-aux/meson-dist | 1 +
build-aux/meson-win-wrapper.txt | 2 ++
server/tests/meson.build | 2 +-
4 files changed, 24 insertions(+), 21 deletions(-)
New commits:
commit 8f315a45e6812e1310356b84491a7bd889a993fd
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Mon May 29 17:15:58 2023 +0100
ci: Do not deep clone spice-protocol repository
Same some network traffic, we don't need to clone entire
git repository history.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c3cc33c..b02a2aeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ before_script:
dconf gcc-c++ autoconf-archive
-y
- &protocol >
- git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git} &&
+ git clone --depth=1 ${CI_REPOSITORY_URL/spice.git/spice-protocol.git} &&
meson setup --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror &&
ninja -C build-spice-protocol install &&
rm -rf build-spice-protocol
commit b21dc45a004e892235cd1753eec52e6be02908fc
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Mon May 29 17:02:13 2023 +0100
ci: Add "setup" subcommand to meson call to avoid warning
Newer meson output a warning if "setup" is not provided.
Remove that warning.
Note that Windows build was not changed due to a bug in mingw-meson
script causing duplication of arguments.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53a96aed..0c3cc33c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
-y
- &protocol >
git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git} &&
- meson --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror &&
+ meson setup --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
@@ -45,7 +45,7 @@ meson-makecheck:
CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
LDFLAGS='-fsanitize=address -lasan'
- meson --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
+ meson setup --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)
@@ -62,7 +62,7 @@ meson-options:
script:
- git clean -fdx
- git submodule foreach --recursive git clean -fdx
- - meson --buildtype=release --werror -Dstatistics=true -Dsasl=false -Dlz4=false -Dtests=false build
+ - meson setup --buildtype=release --werror -Dstatistics=true -Dsasl=false -Dlz4=false -Dtests=false build
- ninja -C build
- (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
@@ -97,7 +97,7 @@ distcheck:
- rm -rf "$dir"
- tar jxvf "$bz2"
- cd "$dir"
- - meson --buildtype=release build
+ - meson setup --buildtype=release build
- ninja -C build
# Same as makecheck job but use a Centos image
@@ -121,7 +121,7 @@ makecheck-centos:
CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
LDFLAGS='-fsanitize=address -lasan'
- meson --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
+ meson setup --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)
@@ -150,7 +150,7 @@ makecheck-debian32:
CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
LDFLAGS='-fsanitize=address -lasan'
- meson --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
+ meson setup --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)
@@ -201,7 +201,7 @@ websocket-autobahn:
- git clean -fdx
- git submodule foreach --recursive git clean -fdx
- >
- meson --buildtype=release build || (cat build/meson-logs/meson-log.txt && exit 1)
+ meson setup --buildtype=release build || (cat build/meson-logs/meson-log.txt && exit 1)
- ninja -C build
- build/server/tests/test-websocket & pid=$!
- wstest -m fuzzingclient -s server/tests/fuzzingclient.json
commit dd40fd32b9e1177b81d8d8d6c91a43398b81bd36
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Mon May 29 11:00:03 2023 +0100
ci: Test some more flags for meson-options
"lz4" and "tests" flags are by default "true", test we can build
if they are "false".
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c84e6b24..53a96aed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ meson-options:
script:
- git clean -fdx
- git submodule foreach --recursive git clean -fdx
- - meson --buildtype=release --werror -Dstatistics=true -Dsasl=false build
+ - meson --buildtype=release --werror -Dstatistics=true -Dsasl=false -Dlz4=false -Dtests=false build
- ninja -C build
- (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
commit f60d61186f566516463d2ab70d561a884d75eb20
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Thu May 11 14:26:12 2023 +0100
ci: Update makecheck-windows job to Meson
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06009359..c84e6b24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,18 +163,18 @@ makecheck-windows:
mingw64-openssl mingw64-glib2 mingw64-glib-networking mingw64-libjpeg-turbo
mingw64-pixman mingw64-opus mingw64-winpthreads mingw64-zlib
mingw64-gstreamer1-plugins-base mingw64-gstreamer1-plugins-good mingw64-orc
- meson
- mkdir spice-protocol/build
- (cd spice-protocol/build && mingw64-meson --werror && ninja install)
- - NOCONFIGURE=yes ./autogen.sh
- - mingw64-configure
- - mingw64-make
+ - >
+ mingw64-meson --buildtype=release -Dlz4=false -Dsasl=false
+ --cross-file build-aux/meson-win-wrapper.txt build
+ - ninja -C build
- export G_TLS_GNUTLS_PRIORITY="NORMAL:%COMPAT"
- export WINEPATH='Z:\usr\x86_64-w64-mingw32\sys-root\mingw\bin'
- export LANG=en_US.UTF-8
# Remove configuration otherwise OpenSSL initialization will fail
- rm -f /usr/x86_64-w64-mingw32/sys-root/mingw/etc/pki/tls/openssl.cnf
- - (cd server && exec mingw64-make LOG_COMPILE=wine check) || (cat server/tests/test-suite.log && exit 1)
+ - (cd build && exec meson test --suite spice -t 5) || (cat build/meson-logs/testlog.txt && exit 1)
websocket-autobahn:
before_script:
diff --git a/build-aux/meson-dist b/build-aux/meson-dist
index 7146ad1e..8ed05eea 100755
--- a/build-aux/meson-dist
+++ b/build-aux/meson-dist
@@ -21,6 +21,7 @@ find . -name .gitignore -delete
rm -rf \
build-aux/useless-if-before-free \
build-aux/vc-list-files \
+build-aux/meson-win-wrapper.txt \
cfg.mk \
docs/how_to_release.md \
docs/manual/images/pepper.png \
diff --git a/build-aux/meson-win-wrapper.txt b/build-aux/meson-win-wrapper.txt
new file mode 100644
index 00000000..976cf2ae
--- /dev/null
+++ b/build-aux/meson-win-wrapper.txt
@@ -0,0 +1,2 @@
+[binaries]
+exe_wrapper = 'wine'
diff --git a/server/tests/meson.build b/server/tests/meson.build
index 1ae7d37c..3e0606cd 100644
--- a/server/tests/meson.build
+++ b/server/tests/meson.build
@@ -1,5 +1,5 @@
test_lib_include = [spice_server_include, include_directories('.')]
-test_lib_deps = [spice_server_deps]
+test_lib_deps = [spice_server_deps, spice_common.get_variable('gio2_deps')]
if host_machine.system() != 'windows'
test_lib_deps += [dependency('gio-unix-2.0')]
endif
commit 48590b23bacf44cb6e18b53c6f11f148b327cf04
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Thu May 11 13:07:32 2023 +0100
ci: Update makecheck-centos job
Update to stream9 instead of stream8.
Move to Meson instead of Autoconf as build system.
Remove libcacard-devel, not available.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 174ea517..06009359 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,26 +104,26 @@ distcheck:
makecheck-centos:
before_script:
- dnf install -y 'dnf-command(config-manager)'
- - dnf config-manager --set-enabled powertools
+ - dnf config-manager --set-enabled crb
- >
- dnf install git libtool make libasan orc-devel glib-networking
+ dnf install git libasan orc-devel glib-networking
gcc glib2-devel diffutils
opus-devel pixman-devel openssl-devel libjpeg-devel
- libcacard-devel cyrus-sasl-devel lz4-devel
+ cyrus-sasl-devel lz4-devel
gstreamer1-devel gstreamer1-plugins-base-devel
git-core python3-pyparsing python3-six python3
- meson gcc-c++ autoconf-archive
+ meson gcc-c++
-y
- *protocol
- image: quay.io/centos/centos:stream8
+ image: quay.io/centos/centos:stream9
script:
- >
CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
LDFLAGS='-fsanitize=address -lasan'
- ./autogen.sh --enable-werror
- - make
- - make -C server check || (cat server/tests/test-suite.log && 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)
# Same as meson-makecheck job but use a Debian i386 image,
# this in order to test a 32 bit machine
More information about the Spice-commits
mailing list