[Spice-devel] [PATCH spice-server v3 2/2] Update gitlab-ci to use meson
Eduardo Lima (Etrunko)
etrunko at redhat.com
Tue Jul 24 15:21:28 UTC 2018
On 24/07/18 10:21, Uri Lublin wrote:
> On 07/24/2018 03:15 PM, Eduardo Lima (Etrunko) wrote:
>> Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
>> ---
>> .gitlab-ci.yml | 31 ++++++++++++++++++++++++++++++-
>> 1 file changed, 30 insertions(+), 1 deletion(-)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index 50fb7a15..44dc26d3 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -4,7 +4,7 @@ before_script:
>> - >
>> dnf install 'dnf-command(copr)' git libtool make libasan orc-devel
>> python3 python3-six python3-pyparsing glib-networking
>> - asciidoc bzip2
>> + asciidoc bzip2 python3-devel meson ninja-build
>
> Hi Eduardo,
>
> What requires python3-devel ?
>
Good question. It comes from the meson.build file in spice-common, but i
don't really remember why it was added in first place. I have removed
this dependency and ran it with the gitlab ci. It still works.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0223bff..2169b82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ before_script:
- >
dnf install 'dnf-command(copr)' git libtool make libasan
python3 python3-six python3-pyparsing glib-networking
- python3-devel meson ninja-build gdk-pixbuf2-devel
+ meson ninja-build gdk-pixbuf2-devel
-y
- dnf copr enable @spice/nightly -y
- dnf builddep spice -y
diff --git a/meson.build b/meson.build
index 28e7c29..b98e2ca 100644
--- a/meson.build
+++ b/meson.build
@@ -129,10 +129,10 @@ endforeach
# Python
if get_option('python-checks')
- dependency('python3')
py_module = import('python3')
python = py_module.find_python()
foreach module : ['six', 'pyparsing']
+ message('Checking for python module @0@'.format(module))
cmd = run_command(python, '-m', module)
if cmd.returncode() != 0
error('Python module @0@ not found'.format(module))
https://gitlab.freedesktop.org/etrunko/spice-common/-/jobs/11605
> Uri.
>
>> -y
>> - dnf copr enable @spice/nightly -y
>> - dnf builddep spice -y
--
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etrunko at redhat.com
More information about the Spice-devel
mailing list