Build with Flatpak (#306)

danirabbit · web-flow · commit f029bfcf5508 · 2021-12-27T14:07:11.000-08:00
* Build with Flatpak
* Create ci.yml
* Add sandbox holes
* Filesystem perms back to docs
* don't run tests
* Drop inhibit hole
* Fix custom mime
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -25,7 +25,7 @@
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 <!--- If you have a terminal output you can share with us that would also be great! -->
 
-<!--- To get debug messages: G_MESSAGES_DEBUG=all com.github.philip-scott.spice-up -->
+<!--- To get debug messages: G_MESSAGES_DEBUG=all com.github.philip_scott.spice-up -->
 
 <!--- Sharing the .spice file where the problem is at will also be super helpful. -->
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,32 +8,51 @@ on:
       - synchronize
 
 jobs:
-  build:
+  flatpak:
+    name: Flatpak
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+
     container:
-      image: elementary/docker:unstable
+      image: ghcr.io/elementary/flatpak-platform/runtime:6.1-${{ matrix.arch }}
+      options: --privileged
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Install Dependencies
-      run: |
-        apt update
-        apt install -y libgtk-3-dev libgranite-dev libjson-glib-dev libgudev-1.0-dev libevdev-dev libsoup2.4-dev meson valac
-    - name: Build
-      env:
-        DESTDIR: out
-      run: |
-        meson build
-        ninja -C build install
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU for aarch64 emulation
+        if: ${{ matrix.arch != 'x86_64' }}
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
+      - name: Build
+        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+        with:
+          bundle: spice-up.flatpak
+          manifest-path: com.github.philip_scott.spice-up.yml
+          run-tests: false
+          repository-name: appcenter
+          repository-url: https://flatpak.elementary.io/repo.flatpakrepo
+          cache-key: "flatpak-builder-${{ github.sha }}"
+          arch: ${{ matrix.arch }}
 
   lint:
+    name: Lint
     runs-on: ubuntu-latest
 
     container:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Lint
-      run: io.elementary.vala-lint -d .
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Lint
+        run: io.elementary.vala-lint -d .
diff --git a/README.md b/README.md
@@ -84,5 +84,5 @@ make && sudo make all test install
 
 
 <p align="center">
-    <img src="data/icons/128/com.github.philip-scott.spice-up.svg" alt="Spice-Up's Icon">
+    <img src="data/icons/128/com.github.philip_scott.spice-up.svg" alt="Spice-Up's Icon">
 </p>
diff --git a/com.github.philip_scott.spice-up.yml b/com.github.philip_scott.spice-up.yml
@@ -0,0 +1,63 @@
+app-id: com.github.philip_scott.spice-up
+
+runtime: io.elementary.Platform
+runtime-version: '6.1'
+sdk: io.elementary.Sdk
+
+command: com.github.philip_scott.spice-up
+
+finish-args:
+  - '--share=ipc'
+  - '--socket=fallback-x11'
+  - '--socket=wayland'
+
+  - '--device=all'      # Required for Controllers
+  - '--filesystem=xdg-documents' # Required for library
+
+modules:
+  - name: gudev
+    config-opts:
+      - '--disable-umockdev'
+      - '--disable-gtk-doc'
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/libgudev.git
+        tag: '234'
+
+  - name: libevdev
+    buildsystem: meson
+    config-opts:
+      - -Dtests=disabled
+      - -Ddocumentation=disabled
+    cleanup:
+      - /bin
+      - /include
+      - /lib/pkgconfig
+      - /share
+    sources:
+      - type: archive
+        url: https://www.freedesktop.org/software/libevdev/libevdev-1.12.0.tar.xz
+        sha256: 2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237
+        x-checker-data:
+          type: anitya
+          project-id: 20540
+          stable-only: true
+          url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
+
+  - name: libsoup
+    builddir: true
+    buildsystem: meson
+    config-opts:
+      - "-Dtests=false"
+      - "-Dvapi=disabled"
+      - "-Dintrospection=disabled"
+    sources:
+      - type: archive
+        url: https://gitlab.gnome.org/GNOME/libsoup/-/archive/2.68.2/libsoup-2.68.2.tar.gz
+        sha256: a2a44f8b8eb5e145c5dff473f6d8c5b8f1addcf4e6f12223b4705c7fcc6c29b6
+
+  - name: spice-up
+    buildsystem: meson
+    sources:
+      - type: dir
+        path: .
diff --git a/data/com.github.philip_scott.spice-up.appdata.xml b/data/com.github.philip_scott.spice-up.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2016-2018 Felipe Escoto (https://github.com/Philip-Scott/Spice-up) -->
 <component type="desktop">
-  <id>com.github.philip-scott.spice-up</id>
+  <id>com.github.philip_scott.spice-up</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Spice-Up</name>
diff --git a/data/com.github.philip_scott.spice-up.desktop b/data/com.github.philip_scott.spice-up.desktop
@@ -5,8 +5,8 @@ Comment[ca]=Assaoneu les vostres presentacions
 Comment[es]=Dele vida a sus presentaciones
 Comment[fr]=Épicer vos présentations
 Comment[pt_BR]=Tempere os seus slides
-Exec=com.github.philip-scott.spice-up %u
-Icon=com.github.philip-scott.spice-up
+Exec=com.github.philip_scott.spice-up %u
+Icon=com.github.philip_scott.spice-up
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/data/com.github.philip_scott.spice-up.mime.xml b/data/com.github.philip_scott.spice-up.mime.xml
@@ -2,7 +2,7 @@
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
     <mime-type type="application/x-spiceup">
         <comment>Spice-Up Presentation</comment>
-        <icon name="application-x-spiceup"/>
+        <icon name="com.github.philip_scott.spice-up"/>
         <glob-deleteall/>
         <glob pattern="*.spice"/>
     </mime-type>
diff --git a/data/icons/128/com.github.philip_scott.spice-up.svg b/data/icons/128/com.github.philip_scott.spice-up.svg
diff --git a/data/icons/16/com.github.philip_scott.spice-up.svg b/data/icons/16/com.github.philip_scott.spice-up.svg
diff --git a/data/icons/24/com.github.philip_scott.spice-up.svg b/data/icons/24/com.github.philip_scott.spice-up.svg
diff --git a/data/icons/32/com.github.philip_scott.spice-up.svg b/data/icons/32/com.github.philip_scott.spice-up.svg
diff --git a/data/icons/48/com.github.philip_scott.spice-up.svg b/data/icons/48/com.github.philip_scott.spice-up.svg
diff --git a/data/icons/64/com.github.philip_scott.spice-up.svg b/data/icons/64/com.github.philip_scott.spice-up.svg
diff --git a/data/meson.build b/data/meson.build
@@ -9,17 +9,6 @@ foreach i : icon_sizes
         'icons' / i / meson.project_name() + '.svg',
         install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps'
     )
-
-    install_data(
-        'icons' / i / meson.project_name() + '.svg',
-        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'mimetypes',
-        rename:  'application-x-spiceup.svg'
-    )
-    install_data(
-        'icons' / i / meson.project_name() + '.svg',
-        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'mimetypes',
-        rename:  'application-x-spiceup.svg'
-    )
 endforeach
 
 install_data(
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project(
-    'com.github.philip-scott.spice-up',
+    'com.github.philip_scott.spice-up',
     'vala', 'c',
     version: '0.7'
 )
diff --git a/schemas/CMakeLists.txt b/schemas/CMakeLists.txt
@@ -0,0 +1,2 @@
+include (GSettings)
+add_schema ("com.github.philip_scott.spice-up.gschema.xml")
diff --git a/schemas/com.github.philip_scott.spice-up.gschema.xml b/schemas/com.github.philip_scott.spice-up.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-    <schema id="com.github.philip-scott.spice-up" path="/com/github/philip-scott/spice-up/" gettext-domain="spice-up">
+    <schema id="com.github.philip_scott.spice-up" path="/com/github/philip-scott/spice-up/" gettext-domain="spice-up">
         <key name="pos-x" type="i">
             <default>920</default>
             <summary>The saved width of the window.</summary>
diff --git a/src/Application.vala b/src/Application.vala
@@ -27,7 +27,7 @@ namespace Spice {
 public class Spice.Application : Granite.Application {
     public const string PROGRAM_NAME = N_("Spice-Up");
     public const string ABOUT_STOCK = N_("About Spice-Up");
-    public const string APP_ID = "com.github.philip-scott.spice-up";
+    public const string APP_ID = "com.github.philip_scott.spice-up";
     public const string RESOURCE_PATH = "/com/github/philip-scott/spice-up/";
 
     public bool running = false;
diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala
@@ -39,7 +39,7 @@ public class Spice.Services.Settings : Granite.Services.Settings {
     }
 
     private Settings () {
-        base ("com.github.philip-scott.spice-up");
+        base ("com.github.philip_scott.spice-up");
     }
 
     public void add_file (string file) {
