Skip to content

Commit

Permalink
chore(ci): drop conditional source logic
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bsherman committed Apr 21, 2024
1 parent dcc59d0 commit 47ab583
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 47ab583

Please sign in to comment.