From 21f6e2cc030d489a589338070757584ba515240b Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:03:15 -0400
Subject: [PATCH] feat: bump Fedora 40 to latest and Fedora 39 to gts (#1186)

feat: bump Fedora 40 to latest and Fedora 39 to gts
feat: update ISO build for F40
---
 .github/workflows/reusable-build-iso.yml | 4 ++--
 .github/workflows/reusable-build.yml     | 8 ++++++--
 Containerfile                            | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
index f28fa3146f9..475cedae88d 100644
--- a/.github/workflows/reusable-build-iso.yml
+++ b/.github/workflows/reusable-build-iso.yml
@@ -66,9 +66,9 @@ jobs:
           elif [[ ${{ inputs.brand_name }} == "aurora" ]]; then
             echo "VARIANT=Kinoite" >> $GITHUB_ENV
           fi
-          if [[ ${{ inputs.fedora_version }} == "38" ]]; then
+          if [[ ${{ inputs.fedora_version }} == "39" ]]; then
             echo "IS_GTS_VERSION=true" >> $GITHUB_ENV
-          elif [[ ${{ inputs.fedora_version }} == "39" ]]; then
+          elif [[ ${{ inputs.fedora_version }} == "40" ]]; then
             echo "IS_LATEST_VERSION=true" >> $GITHUB_ENV
           fi
 
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 094a53a378f..57e5ef44647 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -116,12 +116,16 @@ jobs:
           if [[ "${{ matrix.fedora_version }}" -eq "38" ]]; then
             IS_LATEST_VERSION=false
             IS_STABLE_VERSION=true
-            IS_GTS_VERSION=true
+            IS_GTS_VERSION=false
           elif [[ "${{ matrix.fedora_version }}" -eq "39" ]]; then
+            IS_LATEST_VERSION=false
+            IS_STABLE_VERSION=true
+            IS_GTS_VERSION=true
+          elif [[ "${{ matrix.fedora_version }}" -eq "40" ]]; then
             IS_LATEST_VERSION=true
             IS_STABLE_VERSION=true
             IS_GTS_VERSION=false
-          elif [[ "${{ matrix.fedora_version }}" -eq "40" ]]; then
+          elif [[ "${{ matrix.fedora_version }}" -eq "41" ]]; then
             IS_LATEST_VERSION=false
             IS_STABLE_VERSION=false
             IS_GTS_VERSION=false
diff --git a/Containerfile b/Containerfile
index 2d1edcf6b50..a3cc1ec50c5 100644
--- a/Containerfile
+++ b/Containerfile
@@ -3,7 +3,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG AKMODS_FLAVOR="${AKMODS_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:-39}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
 
 ## bluefin image section