From c231977faa2475c902162a0775e6421eaa00f7f2 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sat, 20 Nov 2021 13:18:23 -0500
Subject: [PATCH 1/2] Change indent_size to 2 for YAML files

---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index f055e1c..21f293f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

From b0b6ddfa5d0191dd55a37be29b07a28ef54abeae Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sat, 20 Nov 2021 13:18:47 -0500
Subject: [PATCH 2/2] ci: add Flatpak builder job

---
 .github/workflows/main.yml | 57 ++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ecd312c..ab674cf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,31 +16,46 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
-      - name: Pylint
-        uses: cclauss/GitHub-Action-for-pylint@master
-        with:
-          args: "pylint src/vcs/"
+    - name: Pylint
+      uses: cclauss/GitHub-Action-for-pylint@master
+      with:
+        args: "pylint src/vcs/"
 
-  build:
+  meson-build-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
-      - name: Install dependencies
-        run: sudo apt-get -y install appstream appstream-util desktop-file-utils gettext
+    - name: Install dependencies
+      run: sudo apt-get -y install appstream appstream-util desktop-file-utils gettext
 
-      - name: Meson build
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          action: build
+    - name: Meson build
+      uses: BSFishy/meson-build@v1.0.3
+      with:
+        action: build
 
-      - name: Meson test
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          action: test
+    - name: Meson test
+      uses: BSFishy/meson-build@v1.0.3
+      with:
+        action: test
+
+  flatpak-build-test:
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-40
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - name: Flatpak builder
+      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+      with:
+        bundle: "diffuse.flatpak"
+        manifest-path: "io.github.mightycreak.Diffuse.yml"
+        cache-key: flatpak-builder-${{ github.sha }}
+        run-tests: "true"