[gnome-software/wip/mak/libas] Revert "hack: Make CI work (temporary commit)"
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/mak/libas] Revert "hack: Make CI work (temporary commit)"
- Date: Wed, 10 Feb 2021 14:32:27 +0000 (UTC)
commit 36850caa4a2bf75a6eab655c23a30bfb3321400b
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Feb 10 12:06:29 2021 +0000
Revert "hack: Make CI work (temporary commit)"
This reverts commit 78361021ad33ebfbb6b62447619502825b7c462b.
.gitlab-ci.yml | 4 +---
meson.build | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 557650f81..58b4ea0b2 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 --prefix /usr"
+ MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr"
.build:
before_script:
@@ -21,7 +21,6 @@ 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
@@ -50,7 +49,6 @@ 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 5740b98ed..bfac7a2e0 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('gnome-software', 'c',
version : '40.beta',
license : 'GPL-2.0+',
- default_options : ['warning_level=1', 'c_std=gnu99'],
+ default_options : ['warning_level=1', 'c_std=c99'],
meson_version : '>=0.47.0'
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]