From e659681a0c9e47639fb118b415a2fb3311fe52ed Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sun, 21 Apr 2024 14:12:00 -0500 Subject: [PATCH] chore(ci): drop conditional source logic (#180) --- .github/workflows/reusable-build.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index b6fc510a..d6dcfe40 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -62,17 +62,11 @@ 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 + export SOURCE_IMAGE=base + export SOURCE_ORG=fedora-ostree-desktops echo "SOURCE_IMAGE=${SOURCE_IMAGE}" >> $GITHUB_ENV echo "SOURCE_ORG=${SOURCE_ORG}" >> $GITHUB_ENV + echo "FQ_SOURCE_IMAGE=quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}:${{ matrix.fedora_version }}" >> $GITHUB_ENV - name: Generate tags