AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 15:01:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/cloudprovider-ci' into 'master'

Browse Source 
Matthiasc/cloudprovider ci

See merge request GNOME/gtk!2106
This commit is contained in:
Matthias Clasen 2020-06-17 21:16:17 +00:00
commit f64d0d8cbf
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -18,6 +18,7 @@ stages:
variables: variables:
COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror" COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes" BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
FEATURE_FLAGS: "-Dcloudproviders=true"
MESON_TEST_TIMEOUT_MULTIPLIER: 2 MESON_TEST_TIMEOUT_MULTIPLIER: 2
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17" FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17"
FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
@ -70,7 +71,7 @@ fedora-x86_64:
variables: variables:
EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
script: script:
- meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-Dprofiler=true -Dprofiler=true
_build _build
- ninja -C _build - ninja -C _build
@ -84,7 +85,7 @@ release-build:
variables: variables:
EXTRA_MESON_FLAGS: "--buildtype=release" EXTRA_MESON_FLAGS: "--buildtype=release"
script: script:
- meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
_build _build
- ninja -C _build - ninja -C _build
- .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build x11

4
gtk/gtkplacessidebar.c
View File

@ -25,9 +25,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#ifdef HAVE_CLOUDPROVIDERS #ifdef HAVE_CLOUDPROVIDERS
#include <cloudproviders/cloudproviderscollector.h> #include <cloudproviders.h>
#include <cloudproviders/cloudprovidersaccount.h>
#include <cloudproviders/cloudprovidersprovider.h>
#endif #endif
#include "gtkplacessidebarprivate.h" #include "gtkplacessidebarprivate.h"

2
gtk/gtksidebarrow.c
View File

@ -30,7 +30,7 @@
#include "gtkspinner.h" #include "gtkspinner.h"
#ifdef HAVE_CLOUDPROVIDERS #ifdef HAVE_CLOUDPROVIDERS
#include <cloudproviders/cloudprovidersaccount.h> #include <cloudproviders.h>
#endif #endif
struct _GtkSidebarRow struct _GtkSidebarRow

12
meson.build
View File

@ -37,7 +37,7 @@ wayland_proto_req = '>= 1.20'
wayland_req = '>= 1.14.91' wayland_req = '>= 1.14.91'
graphene_req = '>= 1.9.1' graphene_req = '>= 1.9.1'
epoxy_req = '>= 1.4' epoxy_req = '>= 1.4'
cloudproviders_req = '>= 0.2.5' cloudproviders_req = '>= 0.3.1'
xkbcommon_req = '>= 0.2.0' xkbcommon_req = '>= 0.2.0'
gnome = import('gnome') gnome = import('gnome')
@ -666,7 +666,15 @@ endif
cloudproviders_enabled = get_option('cloudproviders') cloudproviders_enabled = get_option('cloudproviders')
if cloudproviders_enabled if cloudproviders_enabled
cloudproviders_dep = dependency('cloudproviders', required: true) cloudproviders_dep = dependency('cloudproviders',
version: cloudproviders_req,
fallback: [
'libcloudproviders',
'libcloudproviders_dep',
],
default_options: [
'vapigen=false',
])
if cloudproviders_dep.found() if cloudproviders_dep.found()
cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found()) cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
else else

4
subprojects/libcloudproviders.wrap Normal file
View File

@ -0,0 +1,4 @@
[wrap-git]
directory=libcloudproviders
url=https://gitlab.gnome.org/World/libcloudproviders.git
revision=master