Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/atomic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
- main
# - nvidia
version:
- "43"
- "44"
- "45"
env:
IMAGE_NAME: atomic-${{ matrix.variant }}-${{ matrix.suffix }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/toolbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions atomic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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
```
2 changes: 1 addition & 1 deletion atomic/atomic.go
Original file line number Diff line number Diff line change
Expand Up @@ -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."
)
Expand Down
2 changes: 1 addition & 1 deletion atomic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion atomic/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions toolbox/fedora/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func TestHasCompatibleMesaFreeworldDrivers(t *testing.T) {
want bool
}{
{
name: "fedora 43 keeps freeworld mesa drivers",
releaseVersion: "43",
want: true,
name: "fedora 45 skips freeworld mesa drivers",
releaseVersion: "45",
want: false,
},
{
name: "fedora 44 skips freeworld mesa drivers",
Expand Down
4 changes: 2 additions & 2 deletions toolbox/fedora/mesa_policy.go
Original file line number Diff line number Diff line change
@@ -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"
}
Loading