Merge branch 'main' into main

ublue-os · Dec 19, 2024 · 0ed1cec · 0ed1cec
2 parents d37528f + e714ef9
commit 0ed1cec
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
@@ -14,7 +14,7 @@ jobs:
       packages: write
     steps:
       - name: Delete Images Older Than 90 Days
-        uses: dataaxiom/ghcr-cleanup-action@792f00f0ff1466b4ee1eeb46049aeeb6ba7d1c8d # v1.0.14
+        uses: dataaxiom/ghcr-cleanup-action@2d58aab3d24aed94070e032d3091b83d50d93534 # v1.0.15
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           packages: aurora,aurora-asus,aurora-asus-nvidia,aurora-dx,aurora-dx-asus,aurora-dx-hwe,aurora-dx-asus-nvidia,aurora-dx-hwe-nvidia,aurora-dx-nvidia,aurora-dx-surface,aurora-dx-surface-nvidia,aurora-hwe,aurora-hwe-nvidia,aurora-surface,aurora-nvidia,aurora-surface,aurora-surface-nvidia

diff --git a/.github/workflows/reusable-image-scan.yml b/.github/workflows/reusable-image-scan.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Scan SBOM
         id: scan
-        uses: anchore/scan-action@869c549e657a088dc0441b08ce4fc0ecdac2bb65 # v5
+        uses: anchore/scan-action@abae793926ec39a78ab18002bc7fc45bbbd94342 # v5
         with:
           sbom: sbom.json
           output-format: json

diff --git a/build_files/base/07-base-image-changes.sh b/build_files/base/07-base-image-changes.sh
@@ -26,15 +26,13 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
     sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop
     sed -i 's@Keywords=@Keywords=konsole;console;@g' /usr/share/applications/org.gnome.Ptyxis.desktop
     cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop
-    sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.kde.konsole.desktop
 
     # Rebrand to Aurora
     sed -i 's@Bluefin@Aurora@g' /usr/share/applications/system-update.desktop
     sed -i 's@Bluefin@Aurora@g' /usr/share/ublue-os/motd/tips/10-tips.md
     sed -i 's@Bluefin@Aurora@g' /usr/libexec/ublue-flatpak-manager
 
     rm -f /etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in
-    rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop
     systemctl enable kde-sysmonitor-workaround.service
 
     # Get Default Font since font fallback doesn't work

diff --git a/system_files/shared/usr/share/plymouth/themes/spinner/silverblue-watermark.png b/system_files/shared/usr/share/plymouth/themes/spinner/silverblue-watermark.png