[gnome-software/wip/mak/libas: 6/6] hack: Make CI work (temporary commit)
- From: Matthias Klumpp <mak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/mak/libas: 6/6] hack: Make CI work (temporary commit)
- Date: Tue, 2 Feb 2021 21:05:39 +0000 (UTC)
commit db7820e5911c2b937b19666fa91234cf90009852
Author: Matthias Klumpp <matthias tenstral net>
Date: Sat Jan 9 03:28:39 2021 +0100
hack: Make CI work (temporary commit)
Just mess around with the CI config to make the CI work until the MR is
merged and we have it adjusted properly.
.gitlab-ci.yml | 4 +++-
meson.build | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58b4ea0b2..557650f81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ cache:
variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all
- MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr"
+ MESON_COMMON_OPTIONS: "--buildtype debug --prefix /usr"
.build:
before_script:
@@ -21,6 +21,7 @@ fedora-x86_64:
except:
- tags
script:
+ - sudo dnf -y install lmdb-devel libstemmer-devel libyaml-devel gperf
- meson ${MESON_COMMON_OPTIONS}
-Drpm_ostree=true
-Dmalcontent=true
@@ -49,6 +50,7 @@ debian-stable-x86_64:
except:
- tags
script:
+ - sudo apt-get install -yq liblmdb-dev libstemmer-dev libyaml-dev gperf
- meson ${MESON_COMMON_OPTIONS}
-Drpm_ostree=false
-Dmalcontent=false
diff --git a/meson.build b/meson.build
index c218a798b..672d582bf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('gnome-software', 'c',
version : '3.38.1',
license : 'GPL-2.0+',
- default_options : ['warning_level=1', 'c_std=c99'],
+ default_options : ['warning_level=1', 'c_std=gnu99'],
meson_version : '>=0.47.0'
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]