[geary/cherry-pick-c75e097d] Merge branch 'mjog/fix-flatpak-manifest-filename' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 706854a052de94c8afa07917893fa52b07958013
Author: Michael Gratton <mike vee net>
Date:   Fri Mar 13 06:31:43 2020 +0000

    Merge branch 'mjog/fix-flatpak-manifest-filename' into 'mainline'
    
    org.gnome.Geary.yml: Rename to org.gnome.Geary.yaml
    
    See merge request GNOME/geary!423
    
    (cherry picked from commit c75e097d263862f26e0d1a05b740b0a6078f79c2)
    
    e8c48a9a org.gnome.Geary.yml: Rename to org.gnome.Geary.yaml

 .gitlab-ci.yml                              | 2 +-
 meson.build                                 | 2 +-
 org.gnome.Geary.json                        | 2 +-
 org.gnome.Geary.yml => org.gnome.Geary.yaml | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d15f671c..64c6c975 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,7 @@ flatpak:
   variables:
     APP_ID: org.gnome.Geary.Devel
     FLATPAK_MODULE: geary
-    MANIFEST_PATH: org.gnome.Geary.yml
+    MANIFEST_PATH: org.gnome.Geary.yaml
     MESON_ARGS: "-Dprofile=development"
     RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo'
     TEST_RUN_ARGS: $TEST_ARGS
diff --git a/meson.build b/meson.build
index 0bdd1568..c21b4623 100644
--- a/meson.build
+++ b/meson.build
@@ -171,7 +171,7 @@ custom_target(
   'org.gnome.Geary.json',
   build_by_default: true,
   command: [yaml_to_json, '@INPUT@', meson.source_root(), '@OUTPUT@'],
-  input: files('org.gnome.Geary.yml'),
+  input: files('org.gnome.Geary.yaml'),
   output: 'org.gnome.Geary.json'
 )
 
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index ffa0c039..8a81169d 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -1,4 +1,4 @@
-/* Automatically generated from org.gnome.Geary.yml, do not modify. */
+/* Automatically generated from org.gnome.Geary.yaml, do not modify. */
 {
     "app-id": "org.gnome.Geary.Devel",
     "branch": "master",
diff --git a/org.gnome.Geary.yml b/org.gnome.Geary.yaml
similarity index 100%
rename from org.gnome.Geary.yml
rename to org.gnome.Geary.yaml