feat: centralized flatpaks list (#2904)

Author: cloudwithdan

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

@@ -7,8 +7,7 @@ on:
     paths-ignore:
       - ".github/workflows/*iso*"
       - "**.md"
-      - "bluefin_flatpaks/**"
-      - "dx_flatpaks/**"
+      - "flatpaks/**"
       - "iso_files/**"
   schedule:
     - cron: "50 5 * * 0" # 5:50 UTC Weekly on Sundays

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

@@ -8,8 +8,7 @@ on:
     paths-ignore:
       - ".github/workflows/*iso*"
       - "**.md"
-      - "bluefin_flatpaks/**"
-      - "dx_flatpaks/**"
+      - "flatpaks/**"
       - "iso_files/**"
   workflow_call:
   workflow_dispatch:

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

@@ -8,8 +8,7 @@ on:
     paths-ignore:
       - '.github/workflows/*iso*'
       - '**.md'
-      - 'bluefin_flatpaks/**'
-      - 'dx_flatpaks/**'
+      - 'flatpaks/**'
       - 'iso_files/**'
   workflow_call:
   workflow_dispatch:

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

@@ -8,8 +8,7 @@ on:
     paths-ignore:
       - ".github/workflows/*iso*"
       - "**.md"
-      - "bluefin_flatpaks/**"
-      - "dx_flatpaks/**"
+      - "flatpaks/**"
       - "iso_files/**"
   schedule:
     - cron: "50 5 * * 0" # 5:50 UTC sunday

.github/workflows/reusable-build-iso-anaconda.yml

@@ -88,7 +88,7 @@ jobs:
         uses: ublue-os/titanoboa@main
         with:
           image-ref: ${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }}
-          flatpaks-list: ${{ github.workspace }}/iso_files/system-flatpaks.list
+          flatpaks-list: ${{ github.workspace }}/flatpaks/system-flatpaks.list
           hook-post-rootfs: ${{ github.workspace }}/iso_files/configure_iso_anaconda.sh
           kargs: ${{ steps.image_ref.outputs.kargs }}
 

.github/workflows/reusable-build-iso-readymade.yml

@@ -90,7 +90,7 @@ jobs:
         uses: ublue-os/titanoboa@main
         with:
           image-ref: ${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }}
-          flatpaks-list: ${{ github.workspace }}/iso_files/system-flatpaks.list
+          flatpaks-list: ${{ github.workspace }}/flatpaks/system-flatpaks.list
           hook-post-rootfs: ${{ github.workspace }}/iso_files/configure_iso.sh
           kargs: ${{ steps.image_ref.outputs.kargs }}
 

Containerfile

@@ -7,6 +7,7 @@ FROM scratch AS ctx
 COPY /system_files /system_files
 COPY /build_files /build_files
 COPY /iso_files /iso_files
+COPY /flatpaks /flatpaks
 COPY /just /just
 COPY packages.json /
 

Justfile

@@ -519,20 +519,20 @@ build-iso $image="bluefin" $tag="latest" $flavor="main" ghcr="0" pipeline="0":
         rm -rf "${COPYTMP}"
     fi
 
-    FLATPAK_DIR_SHORTNAME="bluefin_flatpaks"
+    FLATPAK_DIR_SHORTNAME="flatpaks"
 
     # Generate Flatpak List
     TEMP_FLATPAK_INSTALL_DIR="$(mktemp -d -p /tmp flatpak-XXXXX)"
     flatpak_refs=()
     while IFS= read -r line; do
         flatpak_refs+=("$line")
-    done < "${FLATPAK_DIR_SHORTNAME}/flatpaks"
+    done < "${FLATPAK_DIR_SHORTNAME}/system-flatpaks.list"
 
     # Add DX Flatpaks if needed
     if [[ "${image_name}" =~ dx ]]; then
         while IFS= read -r line; do
             flatpak_refs+=("$line")
-        done < "dx_flatpaks/flatpaks"
+        done < "flatpaks/system-flatpaks-dx.list"
     fi
 
     echo "Flatpak refs: ${flatpak_refs[@]}"

build_files/shared/build-base.sh

@@ -14,7 +14,7 @@ echo "::endgroup::"
 echo "::group:: Copy Files"
 
 # Copy ISO list for `install-system-flaptaks`
-install -Dm0644 -t /etc/ublue-os/ /ctx/iso_files/*.list
+install -Dm0644 -t /etc/ublue-os/ /ctx/flatpaks/*.list
 
 # Copy Files to Container
 cp -r /ctx/just /tmp/just