feat: add flatpak validation

.github/workflows/build-image-beta.yml

@@ -8,7 +8,6 @@ on:
     paths-ignore:
       - "**.md"
       - "system_files/shared/usr/share/ublue-os/bazaar/config.yaml"
-      - "**.Brewfile"
       - "just/*.just"
   workflow_call:
   workflow_dispatch:

.github/workflows/build-image-latest-main.yml

@@ -8,10 +8,8 @@ on:
     paths-ignore:
       - "**.md"
       - "iso_files/**"
-      - "flatpaks/**"
       - ".github/workflows/*iso*"
       - "system_files/shared/usr/share/ublue-os/bazaar/config.yaml"
-      - "**.Brewfile"
       - "just/*.just"
   workflow_call:
   workflow_dispatch:

.github/workflows/build-image-stable.yml

@@ -8,10 +8,8 @@ on:
     paths-ignore:
       - "**.md"
       - "iso_files/**"
-      - "flatpaks/**"
       - ".github/workflows/*iso*"
       - "system_files/shared/usr/share/ublue-os/bazaar/config.yaml"
-      - "**.Brewfile"
       - "just/*.just"
   schedule:
     - cron: "50 5 * * 0" # 5:50 UTC sunday

.github/workflows/validate-brewfiles.yml

@@ -0,0 +1,39 @@
+name: Validate Brewfiles
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    paths:
+      - "brew/**"
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+
+      - name: Set up Homebrew
+        uses: Homebrew/actions/setup-homebrew@main
+
+      - name: Validate Brewfiles
+        shell: bash
+        run: |
+          echo "Validating Brewfiles..."
+
+
+          find "brew" -iname '*\.Brewfile*' -print0 | \
+            while IFS= read -r -d '' brewfile ; do \
+              echo "::group:: ===$(basename $brewfile)==="
+              grep -E -e "^tap" $brewfile > taps.Brewfile
+              set -xeuo pipefail
+              brew bundle --file=./taps.Brewfile
+              if brew bundle exec whoami --file="$brewfile" | grep -F -e "${USER}" ; then
+                echo "✓ $brewfile is valid"
+              else
+                echo "✗ $brewfile validation failed"
+                exit 1
+              fi
+              set +xeuo pipefail
+              echo "::endgroup::"
+            done

.github/workflows/validate-flatpaks.yml

@@ -0,0 +1,37 @@
+name: Validate Flatpaks
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    paths:
+      - "flatpaks/**"
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+
+      - name: Set up Flathub
+        shell: bash
+        run: |
+          sudo apt install -y flatpak
+          flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+      - name: Validate Brewfiles
+        shell: bash
+        run: |
+          echo "Validating flatpak files in flatpaks/ directory..."
+
+          set -xeuo pipefail
+
+          find "flatpaks" -iname '*\.list*' -print0 | \
+            while IFS= read -r -d '' flatpaks_file ; do \
+              echo "::group:: ===$(basename "$flatpaks_file")==="
+              grep -v "#.*" "$flatpaks_file" | \
+                while read -r flatpak ; do \
+                  flatpak remote-info --user flathub "${flatpak}"
+                done
+              echo "::endgroup::"
+            done

Containerfile

@@ -10,6 +10,7 @@ COPY /iso_files /iso_files
 COPY /just /just
 COPY /flatpaks /flatpaks
 COPY packages.json /
+COPY /brew /brew
 
 ## aurora image section
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base

system_files/shared/usr/share/ublue-os/homebrew/aurora-ai.Brewfile → brew/aurora-ai.Brewfile

@@ -1,5 +1,4 @@
 tap "gptscript-ai/tap"
-tap "homebrew/cask"
 brew "aichat"
 brew "block-goose-cli"
 brew "clio"

build_files/shared/build-base.sh

@@ -12,6 +12,10 @@ cp -r /ctx/just /tmp/just
 cp /ctx/packages.json /tmp/packages.json
 rsync -rvK /ctx/system_files/shared/ /
 
+# Homebrew files
+mkdir -p /usr/share/ublue-os/homebrew/
+cp /ctx/brew/*.Brewfile /usr/share/ublue-os/homebrew/
+
 mkdir -p /tmp/scripts/helpers
 install -Dm0755 /ctx/build_files/shared/utils/ghcurl /tmp/scripts/helpers/ghcurl
 export PATH="/tmp/scripts/helpers:$PATH"