From e9910c094d9a84cbbb8e4e22cb41aa4b22c03e46 Mon Sep 17 00:00:00 2001
From: xyny <60004820+xynydev@users.noreply.github.com>
Date: Fri, 6 Dec 2024 16:22:01 +0200
Subject: [PATCH] fix: streamline recipe, update workflow, document including
 empty objects (#46)

* fix: streamline recipe, update workflow, document including empty objects

* feat: only run one build at a time #43
---
 .github/workflows/build.yml | 19 ++++++++++++-------
 recipes/recipe.yml          |  8 +-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3f902b..09ba95c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,14 +1,19 @@
 name: bluebuild
 on:
   schedule:
-    - cron: "00 06 * * *" # build at 06:00 UTC every day 
-                          # (20 minutes after last ublue images start building)
+    - cron:
+        "00 06 * * *" # build at 06:00 UTC every day
+        # (20 minutes after last ublue images start building)
   push:
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
-      
+
   pull_request:
   workflow_dispatch: # allow manually triggering builds
+concurrency:
+  # only run one build at a time
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   bluebuild:
     name: Build Custom Image
@@ -21,17 +26,17 @@ jobs:
       fail-fast: false # stop GH from cancelling all matrix builds if one fails
       matrix:
         recipe:
-          # !! Add your recipes here 
+          # !! Add your recipes here
           - recipe.yml
     steps:
-       # the build is fully handled by the reusable github action
+      # the build is fully handled by the reusable github action
       - name: Build Custom Image
-        uses: blue-build/github-action@v1.7
+        uses: blue-build/github-action@v1.8
         with:
           recipe: ${{ matrix.recipe }}
           cosign_private_key: ${{ secrets.SIGNING_SECRET }}
           registry_token: ${{ github.token }}
           pr_event_number: ${{ github.event.number }}
 
-          # enabled by default, disable if your image is small and you want faster builds      
+          # enabled by default, disable if your image is small and you want faster builds
           maximize_build_space: true
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 3c55698..6d65da6 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -33,18 +33,12 @@ modules:
     notify: true # Send notification after install/uninstall is finished (true/false)
     system:
       # If no repo information is specified, Flathub will be used by default
-      # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
-      repo-name: flathub
-      repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
       install:
         - org.mozilla.firefox
         - org.gnome.Loupe
-        # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
-      # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08),
-      # only normal flatpak applications are (like Floorp Lightning web browser in this example).
-      # Installing different branches of the same Flatpak is not supported.
       remove:
         - org.gnome.eog
+    user: {} # Also add Flathub user repo, but no user packages
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully