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

Remove use of libglib-testing subproject

See merge request pwithnall/malcontent!3

.gitlab-ci.yml

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

.gitmodules

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

libmalcontent/tests/meson.build

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

meson.build

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

subprojects/libglib-testing

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