From 3d0bdab297a183d1b8e64b9e4d526cbd567a41aa Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sun, 29 Oct 2023 13:59:52 -0300
Subject: [PATCH] ci: Validate Flatpak with flatpak-builder-linter

Validate the Flatpak manifest before building it; then, validate
the build directory; and when publishing, validate the repository
as well.
---
 .github/workflows/build-project.yaml | 13 +++++++++++++
 .github/workflows/publish.yaml       | 15 +++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
index 7e2434d22eeba5..c74b95529391f7 100644
--- a/.github/workflows/build-project.yaml
+++ b/.github/workflows/build-project.yaml
@@ -286,6 +286,14 @@ jobs:
 
           echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT
 
+      - name: Validate Flatpak manifest
+        run: |
+          : Validate Flatpak manifest
+          ls -la .
+          echo "Listing build-aux"
+          ls -la ./build-aux/
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest ./build-aux/com.obsproject.Studio.json
+
       - name: Build Flatpak Manifest 🧾
         uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
         with:
@@ -296,6 +304,11 @@ jobs:
           restore-cache: ${{ fromJSON(steps.setup.outputs.cacheHit) }}
           cache-key: ${{ steps.setup.outputs.cacheKey }}
 
+      - name: Validate build directory
+        run: |
+          : Validate build directory
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest builddir flatpak_app
+
   windows-build:
     name: Windows 🪟
     runs-on: windows-2022
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index a762b7f997a0dc..3cdb03e3bf1f71 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -98,6 +98,11 @@ jobs:
           echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT
           echo "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
 
+      - name: Validate Flatpak manifest
+        run: |
+          : Validate Flatpak manifest
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest build-aux/com.obsproject.Studio.json
+
       - name: Build Flatpak Manifest
         uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
         with:
@@ -126,6 +131,16 @@ jobs:
           : Commit Screenshots to OSTree Repository
           ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
 
+      - name: Validate build directory
+        run: |
+          : Validate build directory
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest builddir flatpak_app
+
+      - name: Validate repository
+        run: |
+          : Validate repository
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+
       - name: Publish to Flathub Beta
         uses: flatpak/flatpak-github-actions/flat-manager@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
         if: ${{ matrix.branch == 'beta' }}