From b57ca72ba14c1512b43d55d8e3cb9f0ebdae8c8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 23:55:10 -0600
Subject: [PATCH 1/2] build(deps): bump ublue-os/isogenerator from 2.1.2 to
 2.1.3 (#36)

Bumps [ublue-os/isogenerator](https://github.com/ublue-os/isogenerator) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/ublue-os/isogenerator/releases)
- [Changelog](https://github.com/ublue-os/isogenerator/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ublue-os/isogenerator/compare/v2.1.2...v2.1.3)

---
updated-dependencies:
- dependency-name: ublue-os/isogenerator
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release-please.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index c548286..702c5eb 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Generate ISO
-        uses: ublue-os/isogenerator@v2.1.2
+        uses: ublue-os/isogenerator@v2.1.3
         id: isogenerator
         with:
           image-name: cinnamon

From 19b3fd047b92389b0df7be74afb5e3b93805db2c Mon Sep 17 00:00:00 2001
From: RJ Trujillo <rjtrujillo@protonmail.ch>
Date: Sat, 21 Oct 2023 07:26:01 -0600
Subject: [PATCH 2/2] feat(ci): Enable images based on Fedora 39 (#39)

* feat(ci): Enable images based on Fedora 39

Builds images based on Fedora 39

* feat(ci): Add support for gts (Fedora - 1) images

Stays one release behind the latest Fedora release

* fix(f39): Exclude raw-thumbnailer from Fedora 39 images
---
 .github/workflows/build.yml | 13 ++++++++++---
 Containerfile               |  2 +-
 packages.json               | 14 ++++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cdcb339..15b25da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build and Push Image
 on:
   pull_request:
-  merge_group:    
+  merge_group:
   schedule:
     - cron: '20 22 * * *'  # 10:20pm everyday
   workflow_dispatch:
@@ -21,12 +21,17 @@ jobs:
       fail-fast: false
       matrix:
         image_flavor: [main, nvidia]
-        major_version: [38]
+        major_version: [38, 39]
         include:
+          - major_version: 39
+            is_latest_version: true
+            is_stable_version: false
+            is_gts_version: false
           - major_version: 38
             is_latest_version: true
             is_stable_version: true
-    steps: 
+            is_gts_version: true
+    steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
         uses: actions/checkout@v4
@@ -63,6 +68,8 @@ jobs:
           if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \
              [[ "${{ matrix.is_stable_version }}" == "true" ]]; then
               BUILD_TAGS+=("latest")
+          elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then
+              BUILD_TAGS+=("gts")
           fi
 
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
diff --git a/Containerfile b/Containerfile
index aad8fc1..a3225ad 100644
--- a/Containerfile
+++ b/Containerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-base}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder
 
diff --git a/packages.json b/packages.json
index 879eb91..712000e 100644
--- a/packages.json
+++ b/packages.json
@@ -50,7 +50,6 @@
                 "pipewire-pulseaudio",
                 "powerline",
                 "qgnomeplatform-qt5",
-                "raw-thumbnailer",
                 "redshift-gtk",
                 "sane-backends-drivers-scanners",
                 "setroubleshoot",
@@ -78,6 +77,7 @@
     "37": {
         "include": {
             "all": [
+                "raw-thumbnailer"
 	    ]
         },
         "exclude": {
@@ -86,11 +86,21 @@
     },
     "38": {
         "include": {
-            "all": []
+            "all": [
+                "raw-thumbnailer"
+            ]
         },
         "exclude": {
             "all": [
 	    ]
         }
+    },
+    "39": {
+        "include": {
+            "all": []
+        },
+        "exclude": {
+            "all": []
+        }
     }
 }