diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 4585753..960bf17 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -99,12 +99,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 6e70ff5..cc13388 100644 --- a/Containerfile +++ b/Containerfile @@ -2,11 +2,11 @@ ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue-main}" ARG SOURCE_ORG="${SOURCE_ORG:-ublue-os}" ARG BASE_IMAGE="ghcr.io/${SOURCE_ORG}/${SOURCE_IMAGE}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}" ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" @@ -28,7 +28,7 @@ RUN mkdir -p /var/lib/alternatives && \ FROM main AS nvidia ARG SOURCE_ORG="${SOURCE_ORG:-ublue-os}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}" ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" diff --git a/image-info.sh b/image-info.sh index 96d3ba2..d519044 100755 --- a/image-info.sh +++ b/image-info.sh @@ -6,10 +6,10 @@ IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" case $FEDORA_MAJOR_VERSION in - 39) + 40) IMAGE_TAG="latest" ;; - 38) + 39) IMAGE_TAG="gts" ;; *) diff --git a/install.sh b/install.sh index 748e645..878e395 100755 --- a/install.sh +++ b/install.sh @@ -9,8 +9,8 @@ if [ "${KERNEL_FLAVOR}" = "main" ]; then exit 0 fi -# after F40 launches, bump to 41 -if [[ "${FEDORA_MAJOR_VERSION}" -ge 40 ]]; then +# after F41 launches, bump to 42 +if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then # note: this is done before single mirror hack to ensure this persists in image and is not reset # pre-release rpmfusion is in a different location sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo diff --git a/nvidia-install.sh b/nvidia-install.sh index 8a2a887..04e5a8f 100755 --- a/nvidia-install.sh +++ b/nvidia-install.sh @@ -10,8 +10,8 @@ else sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo fi -# after F40 launches, bump to 41 -if [[ "${FEDORA_MAJOR_VERSION}" -ge 40 ]]; then +# after F41 launches, bump to 42 +if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then # note: this is done before single mirror hack to ensure this persists in image and is not reset # pre-release rpmfusion is in a different location sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo