From 76bc11f234ba9f6e9e979d9c888a43663df857bf Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Wed, 8 Nov 2023 06:16:49 -0700 Subject: [PATCH] feat: Mark Fedora 39 images as stable and roll out gts (#163) This will push Fedora 39 images to latest and set Fedora 38 as the gts release --- .github/workflows/build.yml | 4 ++-- Containerfile | 4 ++-- image-info.sh | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc7fc0f..f30038a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,14 +36,14 @@ jobs: is_stable_version: true is_gts_driver: false - major_version: 38 - is_latest_version: true + is_latest_version: false is_stable_version: true is_gts_driver: true - driver_version: 535 is_latest_driver: true - major_version: 39 is_latest_version: true - is_stable_version: false + is_stable_version: true is_gts_version: false exclude: # There is no Fedora 37 version of sericea diff --git a/Containerfile b/Containerfile index ad5541a..4a3919f 100644 --- a/Containerfile +++ b/Containerfile @@ -1,13 +1,13 @@ ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-main" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS nvidia ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG IMAGE_VENDOR="ublue-os" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}" COPY image-info.sh /tmp/image-info.sh diff --git a/image-info.sh b/image-info.sh index c4c31da..96d3ba2 100755 --- a/image-info.sh +++ b/image-info.sh @@ -6,9 +6,12 @@ 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 - 38) + 39) IMAGE_TAG="latest" ;; + 38) + IMAGE_TAG="gts" + ;; *) IMAGE_TAG="$FEDORA_MAJOR_VERSION" ;;