Merge branch 'main' into rechunker-port

Author: dylanmtaylor

build_files/base/04-packages.sh

@@ -169,16 +169,6 @@ dnf -y swap \
     --repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
     fwupd fwupd
 
-# TODO: remove me on next flatpak release when preinstall landed in Fedora
-if [[ "$(rpm -E %fedora)" -ge "42" ]]; then
-  dnf -y copr enable ublue-os/flatpak-test
-  dnf -y copr disable ublue-os/flatpak-test
-  dnf -y --repo=copr:copr.fedorainfracloud.org:ublue-os:flatpak-test swap flatpak flatpak
-  dnf -y --repo=copr:copr.fedorainfracloud.org:ublue-os:flatpak-test swap flatpak-libs flatpak-libs
-  dnf -y --repo=copr:copr.fedorainfracloud.org:ublue-os:flatpak-test swap flatpak-session-helper flatpak-session-helper
-  dnf -y --repo=copr:copr.fedorainfracloud.org:ublue-os:flatpak-test install flatpak-debuginfo flatpak-libs-debuginfo flatpak-session-helper-debuginfo
-fi
-
 ## Pins and Overrides
 ## Use this section to pin packages in order to avoid regressions
 # Remember to leave a note with rationale/link to issue for each pin!

build_files/base/20-tests.sh

@@ -28,9 +28,6 @@ test -f /usr/share/ublue-os/homebrew/fonts.Brewfile
 # See: https://docs.flatpak.org/en/latest/flatpak-command-reference.html#flatpak-preinstall
 test -f /usr/share/flatpak/preinstall.d/bazaar.preinstall
 
-# Basic smoke test to check if the flatpak version is from our copr
-flatpak preinstall --help
-
 # Make sure this garbage never makes it to an image
 test -f /usr/lib/systemd/system/flatpak-add-fedora-repos.service && false
 

build_files/shared/clean-stage.sh

@@ -8,6 +8,8 @@ set -eoux pipefail
 dnf config-manager setopt keepcache=0
 dnf versionlock clear
 
+# This comes last because we can't *ever* afford to ship fedora flatpaks on the image
+systemctl disable flatpak-add-fedora-repos.service
 systemctl mask flatpak-add-fedora-repos.service
 rm -f /usr/lib/systemd/system/flatpak-add-fedora-repos.service
 

image-versions.yml

@@ -2,12 +2,12 @@ images:
   - name: silverblue-main
     image: ghcr.io/ublue-os/silverblue-main
     tag: latest
-    digest: sha256:073d859ca4f8258b28a84347528f12c15df87792b2de6bcb7083388728c18aef
+    digest: sha256:e70754e6235e6cae3ccbc7cd649e61ad161f5e0aad5318feedbe7ae06c129ff8
   - name: common
     image: ghcr.io/projectbluefin/common
     tag: latest
     digest: sha256:c1fcbdf3ccf0aaba71f8aaf2b2a5bd0bc507e6d33c8433bdf29584cd705a41cb
   - name: brew
     image: ghcr.io/ublue-os/brew
     tag: latest
-    digest: sha256:7646a12d0369270ba479bde05d69e273af966a55178f283b0f717381d086ca7a
+    digest: sha256:9dab9ce3232b96d289d131201e007284044a4a9c2073087bb2c698994ec07988