From 47ab58322be9783f25041bd3628f71954378967e Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Sun, 21 Apr 2024 13:24:29 -0500
Subject: [PATCH] chore(ci): drop conditional source logic

Since we don't know when, if ever, the fedora org on quay.io will have
reliable images, stop maintaining a conditional which doesn't get used
and makes the workflow more complicated.

Relates: ublue-os/main#78
---
 .github/workflows/reusable-build.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index b6fc510a..700e2f28 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -62,17 +62,9 @@ jobs:
           else
               echo "IMAGE_NAME=${{ env.IMAGE_BASE_NAME }}-${{ matrix.cfile_suffix }}" >> $GITHUB_ENV
           fi
-          if [[ "${{ matrix.fedora_version }}" -ge "41" ]]; then
-              # when we are confident of official fedora images we can switch to them
-              export SOURCE_IMAGE=fedora-silverblue
-              export SOURCE_ORG=fedora
-          else
-              export SOURCE_IMAGE=base
-              export SOURCE_ORG=fedora-ostree-desktops
-          fi
-          echo "FQ_SOURCE_IMAGE=quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}:${{ matrix.fedora_version }}" >> $GITHUB_ENV
-          echo "SOURCE_IMAGE=${SOURCE_IMAGE}" >> $GITHUB_ENV
-          echo "SOURCE_ORG=${SOURCE_ORG}" >> $GITHUB_ENV
+          echo "SOURCE_IMAGE=base" >> $GITHUB_ENV
+          echo "SOURCE_ORG=fedora-ostree-desktops" >> $GITHUB_ENV
+          echo "FQ_SOURCE_IMAGE=quay.io/${{ env.SOURCE_ORG }}/${{ env.SOURCE_IMAGE }}:${{ matrix.fedora_version }}" >> $GITHUB_ENV
 
 
       - name: Generate tags