Skip to content

Commit

Permalink
feat: bump Fedora 40 to latest and Fedora 39 to gts (#1186)
Browse files Browse the repository at this point in the history
feat: bump Fedora 40 to latest and Fedora 39 to gts
feat: update ISO build for F40
  • Loading branch information
m2Giles authored Apr 23, 2024
1 parent 1e05545 commit 21f6e2c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/reusable-build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 21f6e2c

Please sign in to comment.