diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2019-01-23 19:12:54 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2019-01-23 19:13:49 -0500 |
| commit | d91c6efd2b7b973fa7aed064b43b64139d7612e7 (patch) | |
| tree | 7c1829ae0c0794531b00f6202ec2107c3c2fd8aa | |
| parent | 856dbfccf298fcb3b35014ffdfa346c54a556e62 (diff) | |
| download | libnice-d91c6efd2b7b973fa7aed064b43b64139d7612e7.tar.gz | |
meson: Require very latest 0.49.1 as older versions break in our CI
Also remove workarounds for the older versions.
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 943ea4b..759d583 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,6 @@ stages: - build - test -# Workaround for https://github.com/mesonbuild/meson/issues/4718 -variables: - LANG: en_US.utf8 - build autotools: stage: build image: registry.freedesktop.org/ocrete/libnice/centos7/autotools-build @@ -85,7 +81,6 @@ test meson: - schedules script: - ifconfig - - unset GITLAB_USER_NAME - source scl_source enable rh-python36 && true - meson test -C build/ --print-errorlogs artifacts: diff --git a/meson.build b/meson.build index f6d7d93..2efb176 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('libnice', 'c', version: '0.1.15.1', - meson_version : '>= 0.49.0', + meson_version : '>= 0.49.1', default_options : ['warning_level=1', 'buildtype=debugoptimized']) nice_version = meson.project_version() |