nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/flatpak-ci' into 'mainline'

Browse source 
Fix Flatpak CI

See merge request GNOME/geary!490
This commit is contained in:
Michael Gratton 2020-04-06 00:00:31 +00:00
commit 98298bb18c
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
org.gnome.Geary.json
View file

@ -133,7 +133,8 @@
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git"
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
"branch": "master"
}
],
"cleanup": [
@ -155,7 +156,8 @@
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/folks.git"
"url": "https://gitlab.gnome.org/GNOME/folks.git",
"branch": "master"
}
],
"cleanup": [
@ -182,7 +184,8 @@
"sources": [
{
"type": "git",
"url": "https://github.com/GNOME/gsound.git"
"url": "https://gitlab.gnome.org/GNOME/gsound.git",
"branch": "master"
}
]
},
@ -191,7 +194,8 @@
"sources": [
{
"type": "git",
"url": "https://github.com/jstedfast/gmime.git"
"url": "https://github.com/jstedfast/gmime.git",
"branch": "master"
}
]
},
@ -215,7 +219,8 @@
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libpeas.git"
"url": "https://gitlab.gnome.org/GNOME/libpeas.git",
"branch": "master"
}
]
},

8
org.gnome.Geary.yaml
View file

@ -152,6 +152,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/evolution-data-server.git
branch: master
cleanup:
- /lib/cmake
- /lib/evolution-data-server/*-backends
@ -169,6 +170,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/folks.git
branch: master
cleanup:
- /bin
@ -187,13 +189,15 @@ modules:
- name: gsound
sources:
- type: git
url: https://github.com/GNOME/gsound.git
url: https://gitlab.gnome.org/GNOME/gsound.git
branch: master
# Geary dependency
- name: gmime
sources:
- type: git
url: https://github.com/jstedfast/gmime.git
branch: master
# Geary dependency
- name: libhandy
@ -211,6 +215,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/libpeas.git
branch: master
# Geary dependency
- name: "libytnef"
@ -234,4 +239,3 @@ modules:
- type: git
url: https://gitlab.gnome.org/GNOME/geary.git
branch: mainline