diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61ed3c7..974a4ac 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c5c8e24..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "subprojects/libglib-testing"] - path = subprojects/libglib-testing - url = https://gitlab.gnome.org/pwithnall/libglib-testing.git diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build index 610bc35..630b3dd 100644 --- a/libmalcontent/tests/meson.build +++ b/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 + [ diff --git a/meson.build b/meson.build index 59e3af4..7f7b24d 100644 --- a/meson.build +++ b/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'))) diff --git a/subprojects/libglib-testing b/subprojects/libglib-testing deleted file mode 160000 index 412c706..0000000 --- a/subprojects/libglib-testing +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 412c706b51ca04a9ca873bfa495e32c47f586c84