meson dist in CI

Author: ranfdev

.github/workflows/flatpak.yml

@@ -1,19 +1,58 @@
 on:
   push:
-    branches: [main]
+    branches: [ ci ]
   pull_request:
-name: CI
+  workflow_dispatch:
+
+concurrency:
+  group: flatpak
+  cancel-in-progress: true
+
 jobs:
-  flatpak:
-    name: "Flatpak"
+  build-and-dist:
     runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
-      options: --privileged
+
     steps:
-    - uses: actions/checkout@v4
-    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      with:
-        bundle: distroshelf.flatpak
-        manifest-path: com.ranfdev.DistroShelf.json
-        cache-key: flatpak-builder-${{ github.sha }}
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Cache Flatpak SDK/runtime
+        uses: actions/cache@v3
+        with:
+          path: repo
+          key: flatpak-${{ runner.os }}-${{ hashFiles('**/com.ranfdev.DistroShelf.json') }} 
+
+      - name: Install Flatpak & Builder
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y flatpak flatpak-builder
+        # flatpak-builder is a wrapper around flatpak build that automates fetching sources,
+        # initializing the build, building modules, and exporting the result
+
+      - name: Add Flathub remote
+        run: |
+          flatpak --user remote-add --if-not-exists flathub \
+            https://dl.flathub.org/repo/flathub.flatpakrepo
+        # Required to pull SDK/runtime deps
+
+      - name: Build & run Meson dist in sandbox
+        run: |
+          # Perform a clean build, installing deps from Flathub into 'build' dir
+          flatpak-builder --user \
+                          --force-clean \
+                          --install-deps-from=flathub \
+                          --repo=repo \
+                          --keep-build-dirs \
+                          build \
+                          com.ranfdev.DistroShelf.json
+
+          # Spawn a shell inside the build sandbox and run `meson dist`
+          flatpak-builder --run build com.ranfdev.DistroShelf.json meson dist "-C.flatpak-builder/build/distroshelf/_flatpak_build"
+        # `--run` spawns the build sandbox and executes the given command
+
+      - name: Upload Meson distribution artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: meson-dist
+          path: '.flatpak-builder/build/distroshelf/_flatpak_build/meson-dist/*.tar.gz'
+        # Uploads any .tar.gz produced by meson dist; supports wildcards and directories