Merge branch 'no-more-subprojects' into 'master'

Remove use of libglib-testing subproject

See merge request pwithnall/malcontent!3
This commit is contained in:
Philip Withnall 2020-04-15 14:31:45 +00:00
commit 2c0eea4ce5
5 changed files with 9 additions and 18 deletions

View File

@ -1,11 +1,12 @@
image: fedora:30 image: debian:unstable
before_script: before_script:
- dnf install -y meson pkgconf-pkg-config gtk-doc - apt update
libxml2-devel dbus-daemon - apt install -y meson pkg-config gtk-doc-tools libxml2-utils
glib2-devel dbus-devel gobject-introspection-devel libglib2.0-dev libgirepository1.0-dev libpam0g-dev
gettext-devel polkit-devel polkit-gnome git gettext policykit-1 libpolkit-gobject-1-dev git
lcov pam-devel gtk3-devel accountsservice-devel flatpak-devel lcov libgtk-3-dev libaccountsservice-dev libflatpak-dev
libglib-testing-0-dev
- export LANG=C.UTF-8 - export LANG=C.UTF-8
stages: stages:
@ -16,12 +17,11 @@ cache:
paths: paths:
- _ccache/ - _ccache/
fedora: debian:
stage: build stage: build
except: except:
- tags - tags
script: script:
- git submodule update --init
- meson --buildtype debug --werror -Db_coverage=true -Ddocumentation=true _build . - meson --buildtype debug --werror -Db_coverage=true -Ddocumentation=true _build .
- meson test -C _build - meson test -C _build
# FIXME: lcov doesn't support gcc9 yet: # FIXME: lcov doesn't support gcc9 yet:

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "subprojects/libglib-testing"]
path = subprojects/libglib-testing
url = https://gitlab.gnome.org/pwithnall/libglib-testing.git

View File

@ -3,8 +3,8 @@ deps = [
dependency('gio-unix-2.0', version: '>= 2.44'), dependency('gio-unix-2.0', version: '>= 2.44'),
dependency('glib-2.0', version: '>= 2.60.0'), dependency('glib-2.0', version: '>= 2.60.0'),
dependency('gobject-2.0', version: '>= 2.44'), dependency('gobject-2.0', version: '>= 2.44'),
dependency('glib-testing-0'),
libmalcontent_dep, libmalcontent_dep,
libglib_testing_dep,
] ]
envs = test_env + [ envs = test_env + [

View File

@ -41,11 +41,6 @@ polkit_gobject = dependency('polkit-gobject-1')
polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir',
define_variable: ['prefix', prefix]) define_variable: ['prefix', prefix])
libglib_testing_dep = dependency(
'glib-testing-0',
fallback: ['libglib-testing', 'libglib_testing_dep'],
)
config_h = configuration_data() config_h = configuration_data()
config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent') config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent')
config_h.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir'))) config_h.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir')))

@ -1 +0,0 @@
Subproject commit 412c706b51ca04a9ca873bfa495e32c47f586c84