CI: Hopefully truly fix CI

mufeedali · Dec 17, 2023 · 367e7ee · 367e7ee
1 parent 9fa9801
commit 367e7ee
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 25 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
-        bundle: "wordbook-dev.flatpak"
+        bundle: "wordbook-devel.flatpak"
         manifest-path: "build-aux/flatpak/dev.mufeed.Wordbook.Devel.json"
         run-tests: "true"
         cache-key: flatpak-builder-${{ github.sha }}
diff --git a/build-aux/flatpak/dev.mufeed.Wordbook.Devel.json b/build-aux/flatpak/dev.mufeed.Wordbook.Devel.json
@@ -23,7 +23,9 @@
     {
       "name": "blueprint-compiler",
       "buildsystem": "meson",
-      "cleanup": ["*"],
+      "cleanup": [
+        "*"
+      ],
       "sources": [
         {
           "type": "git",
@@ -63,18 +65,18 @@
       "sources": [
         {
           "type": "file",
-          "url": "https://files.pythonhosted.org/packages/4c/dd/2234eab22353ffc7d94e8d13177aaa050113286e93e7b40eae01fbf7c3d9/certifi-2023.7.22-py3-none-any.whl",
-          "sha256": "92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"
+          "url": "https://files.pythonhosted.org/packages/64/62/428ef076be88fa93716b576e4a01f919d25968913e817077a386fcbe4f42/certifi-2023.11.17-py3-none-any.whl",
+          "sha256": "e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"
         },
         {
           "type": "file",
-          "url": "https://files.pythonhosted.org/packages/2a/53/cf0a48de1bdcf6ff6e1c9a023f5f523dfe303e4024f216feac64b6eb7f67/charset-normalizer-3.2.0.tar.gz",
-          "sha256": "3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"
+          "url": "https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8/charset-normalizer-3.3.2.tar.gz",
+          "sha256": "f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"
         },
         {
           "type": "file",
-          "url": "https://files.pythonhosted.org/packages/fc/34/3030de6f1370931b9dbb4dad48f6ab1015ab1d32447850b9fc94e60097be/idna-3.4-py3-none-any.whl",
-          "sha256": "90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
+          "url": "https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl",
+          "sha256": "c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"
         },
         {
           "type": "file",
@@ -88,19 +90,18 @@
         },
         {
           "type": "file",
-          "url": "https://files.pythonhosted.org/packages/37/dc/399e63f5d1d96bb643404ee830657f4dfcf8503f5ba8fa3c6d465d0c57fe/urllib3-2.0.5-py3-none-any.whl",
-          "sha256": "ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e"
+          "url": "https://files.pythonhosted.org/packages/96/94/c31f58c7a7f470d5665935262ebd7455c7e4c7782eb525658d3dbf4b9403/urllib3-2.1.0-py3-none-any.whl",
+          "sha256": "55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"
         },
         {
           "type": "file",
-          "url": "https://files.pythonhosted.org/packages/2d/7d/8bb7ca374da80c828cbc5a45e98bfab121a139770a91a1fd2ee7cfb72cab/wn-0.9.4-py3-none-any.whl",
-          "sha256": "6726255c04c6adbd9dcae6155e088e731358aa4957784a5ec23dd7421cc65c9f"
+          "url": "https://files.pythonhosted.org/packages/ee/27/da67032f35515beb1ad22b66e98ea4e3e708a063e5f626b76045808589d8/wn-0.9.5-py3-none-any.whl",
+          "sha256": "fa17477bd39bcb8417a11aa8e08c67b9ea72e0c0557cd6f4de26fe9c93e60e39"
         }
       ]
     },
     {
       "name": "wordbook",
-      "builddir": true,
       "buildsystem": "meson",
       "config-opts": [
         "-Dprofile=development"
@@ -113,4 +114,4 @@
       ]
     }
   ]
-}
+}
diff --git a/data/dev.mufeed.Wordbook.desktop.in.in b/data/dev.mufeed.Wordbook.desktop.in.in
@@ -6,7 +6,7 @@ Exec=wordbook
 Comment=Look up definitions for any English term
 Terminal=false
 Type=Application
-Icon=@icon@
+Icon=@app-id@
 Categories=Dictionary;Education;GTK;
 # Translators: These are search terms to find this application. Do NOT translate or localize the semicolons. The list MUST also end with a semicolon.
 Keywords=dictionary;

diff --git a/data/dev.mufeed.Wordbook.gschema.xml → data/dev.mufeed.Wordbook.gschema.xml.in b/data/dev.mufeed.Wordbook.gschema.xml → data/dev.mufeed.Wordbook.gschema.xml.in
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="wordbook">
-	<schema id="dev.mufeed.Wordbook" path="/dev/mufeed/Wordbook/">
-	</schema>
+    <schema id="@app-id@" path="/dev/mufeed/Wordbook/">
+    </schema>
 </schemalist>
-
diff --git a/data/meson.build b/data/meson.build
@@ -1,11 +1,9 @@
-pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
-gnome = import('gnome')
-
 subdir('icons')
 subdir('resources')
 
+# Desktop file
 desktop_conf = configuration_data()
-desktop_conf.set('icon', application_id)
+desktop_conf.set('app-id', application_id)
 desktop_file = i18n.merge_file(
   input: configure_file(
     input: '@[email protected]'.format(base_id),
@@ -26,6 +24,7 @@ if desktop_utils.found()
   )
 endif
 
+# Metainfo file
 appdata_conf = configuration_data()
 appdata_conf.set('app-id', application_id)
 appstream_file = i18n.merge_file(
@@ -34,10 +33,10 @@ appstream_file = i18n.merge_file(
     output: '@BASENAME@',
     configuration: appdata_conf
   ),
-  output: base_id + '.metainfo.xml',
+  output: '@0@.metainfo.xml'.format(application_id),
   po_dir: '../po',
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
 appstreamcli = find_program('appstreamcli', required: false)
@@ -47,7 +46,14 @@ if appstreamcli.found()
   )
 endif
 
-install_data(base_id + '.gschema.xml',
+# GSettings schema
+gschema_conf = configuration_data()
+gschema_conf.set('app-id', application_id)
+configure_file(
+  input: '@[email protected]'.format(base_id),
+  output: '@[email protected]'.format(application_id),
+  configuration: gschema_conf,
+  install: true,
   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )
 

diff --git a/data/resources/meson.build b/data/resources/meson.build
@@ -1,3 +1,6 @@
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+gnome = import('gnome')
+
 blueprints = custom_target('blueprints',
   input: files(
     'ui/shortcuts_window.blp',