From 7b9e39857854752785b2593dcf3449dd718fcfb6 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <rjtrujillo@protonmail.ch>
Date: Fri, 20 Oct 2023 21:50:26 -0600
Subject: [PATCH 1/3] feat(ci): Enable images based on Fedora 39

Builds images based on Fedora 39
---
 .github/workflows/build.yml | 5 ++++-
 Containerfile               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cdcb339..7f411b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,8 +21,11 @@ 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
           - major_version: 38
             is_latest_version: true
             is_stable_version: true
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
 

From 5bc78551b0b296736fff0128d38a1201420005ef Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Fri, 20 Oct 2023 22:01:17 -0600
Subject: [PATCH 2/3] feat(ci): Add support for gts (Fedora - 1) images

Stays one release behind the latest Fedora release
---
 .github/workflows/build.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f411b6..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:
@@ -26,10 +26,12 @@ jobs:
           - 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
@@ -66,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

From 0319d3b579286b3252844ed231123d8409e3d57d Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Fri, 20 Oct 2023 22:04:10 -0600
Subject: [PATCH 3/3] fix(f39): Exclude raw-thumbnailer from Fedora 39 images

---
 packages.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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": []
+        }
     }
 }