From e9a142808469cdc81cc903df7a330e00b2edfbd0 Mon Sep 17 00:00:00 2001
From: Hannes Kuchelmeister <13hannes11@users.noreply.github.com>
Date: Tue, 16 Jul 2024 07:57:59 +0200
Subject: [PATCH] Add building of all flatpak manifest targets (closes #48)

---
 .github/workflows/pre-release.yml | 58 +++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index cbba694..82b7e21 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -7,8 +7,8 @@ on:
 name: build-and-prerelease
 
 jobs:
-  flatpak:
-    name: Flatpak-prerelease
+  flatpak-release-target:
+    name: build-flatpak-release-target
     runs-on: ubuntu-latest
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-46
@@ -19,14 +19,58 @@ jobs:
         lfs: true
     - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
       with:
-        bundle: toolboxtuner.flatpak
+        bundle: toolboxtuner-release.flatpak
+        manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.json
+        run-tests: true
+        cache-key: flatpak-builder-release-${{ github.sha }}
+        upload-artifact: false
+    - uses: actions/upload-artifact@v4
+      with:
+        name: flatpak-release
+        path: |
+          *.flatpak
+  flatpak-screenshot-target:
+    name: build-flatpak-screenshot-target
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        lfs: true
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
+      with:
+        bundle: toolboxtuner-screenshot.flatpak
+        manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json
+        run-tests: true
+        cache-key: flatpak-builder-screenshot-${{ github.sha }}
+        upload-artifact: false
+    - uses: actions/upload-artifact@v4
+      with:
+        name: flatpak-screenshot
+        path: |
+          *.flatpak
+  flatpak-dev-target:
+    name: build-flatpak-dev-target
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        lfs: true
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
+      with:
+        bundle: toolboxtuner-dev.flatpak
         manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json
         run-tests: true
-        cache-key: flatpak-builder-${{ github.sha }}
+        cache-key: flatpak-builder-dev-${{ github.sha }}
         upload-artifact: false
     - uses: actions/upload-artifact@v4
       with:
-        name: flatpak
+        name: flatpak-dev
         path: |
           *.flatpak
   vendor:
@@ -47,7 +91,7 @@ jobs:
           *.sha256sum
   publish-prerelease:
     name: publish-prerelease
-    needs: [flatpak, vendor]
+    needs: [flatpak-dev-target, vendor]
     runs-on: ubuntu-latest
     if: startsWith(github.ref_name, 'main') && github.ref_type == 'branch'
     steps:
@@ -61,7 +105,7 @@ jobs:
         automatic_release_tag: dev
         title: 'Latest Development Build'
         files: |
-          **/*.flatpak
+          **/*-dev.flatpak
           **/*.tar.gz
           **/*.sha256sum