From 14585e620177e4820b5f1cb33ba570c3c007ca8e Mon Sep 17 00:00:00 2001 From: Scott Ames Date: Sat, 7 Nov 2026 13:01:12 -0800 Subject: [PATCH 1/2] feat: build Fedora 44 and 45 images and drop 43 --- .github/workflows/atomic.yaml | 2 +- .github/workflows/toolbox.yaml | 4 ++-- atomic/README.md | 4 ++-- atomic/atomic.go | 2 +- atomic/main.go | 2 +- justfile | 2 +- toolbox/fedora/main_test.go | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/atomic.yaml b/.github/workflows/atomic.yaml index 230e90c..5c3c76e 100644 --- a/.github/workflows/atomic.yaml +++ b/.github/workflows/atomic.yaml @@ -41,8 +41,8 @@ jobs: - main # - nvidia version: - - "43" - "44" + - "45" env: IMAGE_NAME: atomic-${{ matrix.variant }}-${{ matrix.suffix }} steps: diff --git a/.github/workflows/toolbox.yaml b/.github/workflows/toolbox.yaml index 0048347..7d4fa0b 100644 --- a/.github/workflows/toolbox.yaml +++ b/.github/workflows/toolbox.yaml @@ -27,9 +27,9 @@ jobs: fail-fast: false matrix: release: - - version: 43 - latest: false - version: 44 + latest: false + - version: 45 latest: true name: fedora-toolbox uses: ./.github/workflows/reusable-toolbox.yaml diff --git a/atomic/README.md b/atomic/README.md index 471918b..8a46951 100644 --- a/atomic/README.md +++ b/atomic/README.md @@ -33,7 +33,7 @@ dagger call -m atomic --help # print help for atomic Dagger module # change IMAGE and TAG as desired # https://github.com/scottames?tab=packages&repo_name=containers IMAGE=atomic-silverblue-main \ - TAG=43 \ + TAG=45 \ rpm-ostree rebase \ ostree-unverified-registry:ghcr.io/scottames/$IMAGE:$TAG ``` @@ -44,7 +44,7 @@ dagger call -m atomic --help # print help for atomic Dagger module # change IMAGE and TAG as desired # https://github.com/scottames?tab=packages&repo_name=containers IMAGE=atomic-silverblue-main \ - TAG=43 \ + TAG=45 \ rpm-ostree rebase \ ostree-image-signed:docker://ghcr.io/scottames/$IMAGE:$TAG ``` diff --git a/atomic/atomic.go b/atomic/atomic.go index dd23609..f26d718 100644 --- a/atomic/atomic.go +++ b/atomic/atomic.go @@ -8,7 +8,7 @@ import ( const ( // renovate: datasource=docker depName=quay.io/fedora-ostree-desktops/silverblue - latestFedoraVersion = "40" + latestFedoraVersion = "45" description = "scottames' custom Fedora Silverblue native container image powered by Universal Blue." ) diff --git a/atomic/main.go b/atomic/main.go index a71be67..44b7205 100644 --- a/atomic/main.go +++ b/atomic/main.go @@ -45,7 +45,7 @@ func New( suffix *string, // Tag or major release version // +optional - // +default="40" + // +default="45" tag string, // Labels to be applied to the generated container image in addition // to the default labels diff --git a/justfile b/justfile index 3240c43..84e1b10 100644 --- a/justfile +++ b/justfile @@ -6,7 +6,7 @@ progress := if args != "" { "auto" } else { "plain" } tags := "" # renovate: datasource=docker depName=quay.io/fedora-ostree-desktops/silverblue -tagFedoraLatestVersion := "43" +tagFedoraLatestVersion := "45" _default: diff --git a/toolbox/fedora/main_test.go b/toolbox/fedora/main_test.go index 261a38e..da1891b 100644 --- a/toolbox/fedora/main_test.go +++ b/toolbox/fedora/main_test.go @@ -39,8 +39,8 @@ func TestHasCompatibleMesaFreeworldDrivers(t *testing.T) { want bool }{ { - name: "fedora 43 keeps freeworld mesa drivers", - releaseVersion: "43", + name: "fedora 45 keeps freeworld mesa drivers", + releaseVersion: "45", want: true, }, { From 5b370c9a7c6e390e1676d2fc3a38da67f04ca08d Mon Sep 17 00:00:00 2001 From: Scott Ames Date: Sat, 7 Nov 2026 14:09:25 -0800 Subject: [PATCH 2/2] fix: handle Fedora 45 font and Mesa package availability --- atomic/packages.go | 5 ++++- toolbox/fedora/main_test.go | 4 ++-- toolbox/fedora/mesa_policy.go | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/atomic/packages.go b/atomic/packages.go index 48344f2..85d179a 100644 --- a/atomic/packages.go +++ b/atomic/packages.go @@ -103,6 +103,10 @@ var ( }, }, All: { + // mscore-fonts-all is unavailable in the Fedora 45 repositories. + "44": { + "mscore-fonts-all", + }, All: { // Installed via script // "1password", @@ -141,7 +145,6 @@ var ( "lm_sensors", // required by freon gnome-ext "mise", // from copr:scottames/mise "mosh", - "mscore-fonts-all", "netcat", "NetworkManager-tui", "nodejs", // required for vicinae extensions diff --git a/toolbox/fedora/main_test.go b/toolbox/fedora/main_test.go index da1891b..27e4cc1 100644 --- a/toolbox/fedora/main_test.go +++ b/toolbox/fedora/main_test.go @@ -39,9 +39,9 @@ func TestHasCompatibleMesaFreeworldDrivers(t *testing.T) { want bool }{ { - name: "fedora 45 keeps freeworld mesa drivers", + name: "fedora 45 skips freeworld mesa drivers", releaseVersion: "45", - want: true, + want: false, }, { name: "fedora 44 skips freeworld mesa drivers", diff --git a/toolbox/fedora/mesa_policy.go b/toolbox/fedora/mesa_policy.go index 22f9082..48b7802 100644 --- a/toolbox/fedora/mesa_policy.go +++ b/toolbox/fedora/mesa_policy.go @@ -1,7 +1,7 @@ package main -// Fedora 44 RPM Fusion mesa-freeworld packages can lag Fedora mesa versions, +// Fedora 44 and 45 RPM Fusion mesa-freeworld packages can lag Fedora mesa versions, // which makes the swap transaction fail until RPM Fusion catches up. func hasCompatibleMesaFreeworldDrivers(releaseVersion string) bool { - return releaseVersion != "44" + return releaseVersion != "44" && releaseVersion != "45" }