Merge remote-tracking branch 'upstream/main'

awesomekyle · Sep 4, 2024 · dec2e8d · dec2e8d
2 parents e5ecc42 + 0e09f43
commit dec2e8d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/content-filter.yml b/.github/workflows/content-filter.yml
@@ -0,0 +1,15 @@
+name: Check for Spammy Issue Comments
+
+on:
+  issue_comment:
+    types: [created, edited]
+
+permissions:
+  issues: write
+
+jobs:
+  comment-filter:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Comment filter
+      uses: DecimalTurn/Comment-Filter@371a203198873e2f3a66eca63e6ebd947d9c1f13 # v0.1.2
diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
@@ -177,7 +177,7 @@ jobs:
       - name: Upload ISOs and Checksum to Job Artifacts
         if: github.ref_name == 'testing'
         #if: github.event_name == 'pull_request'
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
         with:
           name: ${{ steps.build.outputs.iso_name }}
           path: ${{ steps.upload-directory.outputs.iso-upload-dir }}

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -422,7 +422,7 @@ jobs:
 
       - name: Upload artifact
         if: github.event_name != 'pull_request'
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
         with:
           name: image-${{ env.IMAGE_NAME }}-${{ env.image_flavor }}-${{ matrix.fedora_version }}
           retention-days: 1

diff --git a/.github/workflows/reusable-image-scan.yml b/.github/workflows/reusable-image-scan.yml
@@ -71,7 +71,7 @@ jobs:
           echo "name=$(echo ${IMAGE} | awk -F'/' '{print $NF}' | sed 's/:/-/g')" >> $GITHUB_OUTPUT
 
       - name: Upload scan results
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
         with:
           name: security-${{ steps.artifact-name.outputs.name }}
           if-no-files-found: error

diff --git a/build_files/install-akmods.sh b/build_files/install-akmods.sh
@@ -20,7 +20,6 @@ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 
 # Everyone
 rpm-ostree install \
-    /tmp/akmods/kmods/*xpadneo*.rpm \
     /tmp/akmods/kmods/*xone*.rpm \
     /tmp/akmods/kmods/*openrazer*.rpm \
     /tmp/akmods/kmods/*wl*.rpm \

diff --git a/system_files/shared/usr/libexec/ublue-motd b/system_files/shared/usr/libexec/ublue-motd
@@ -24,5 +24,5 @@ if [[ -f "$TIP_FILE" ]]; then
 
 	TIP_ESCAPED=$(escape "$TIP")
 
-	sed -e "s/%IMAGE_NAME%/$IMAGE_NAME_ESCAPED/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG_ESCAPED/g" -e "s/%TIP%/$TIP_ESCAPED/g" /usr/share/ublue-os/motd/bluefin.md | tr '~' '\n' | /usr/bin/glow -s auto -
+	sed -e "s/%IMAGE_NAME%/$IMAGE_NAME_ESCAPED/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG_ESCAPED/g" -e "s/%TIP%/$TIP_ESCAPED/g" /usr/share/ublue-os/motd/bluefin.md | tr '~' '\n' | /usr/bin/glow -s auto -w 78 -
 fi
diff --git a/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md b/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md
@@ -2,7 +2,7 @@ Follow us on 󰫑 [@UniversalBlue@fosstodon.org](https://fosstodon.org/@Universa
 Bluefin is your gateway to Kubernetes 󱃾 `kind create cluster` to [get started](https://kind.sigs.k8s.io/)
 Bluefin is your gateway to Cloud Native - find your flock at [landscape.cncf.io](https://l.cncf.io)
 Support the app store! Donate to  [Flatpak](https://opencollective.com/flatpak)
-Need more indepth technical information?~Check out the [Bluefin Administrator's Guide](https://universal-blue.discourse.group/docs?topic=40)
+Need more indepth technical information?~Check out the [Bluefin Administrator's Guide](https://docs.projectbluefin.io/administration)
 Like servers? Check out [ucore](https://github.com/ublue-os/ucore)
 Update break something? You can roll back and pin the previous release or build date:~[View our guide](https://universal-blue.discourse.group/docs?topic=513)
 Use `brew search` and `brew install` to install packages. Bluefin will take care of the updates automatically

diff --git a/system_files/silverblue/etc/dconf/db/local.d/01-ublue b/system_files/silverblue/etc/dconf/db/local.d/01-ublue
@@ -3,8 +3,8 @@ favorite-apps = ['org.gnome.Ptyxis.desktop', 'org.mozilla.firefox.desktop', 'org
 enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-panel@jderose9.github.com', 'tailscale@joaophi.github.com']
 
 [org/gnome/desktop/background]
-picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml'
-picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml'
+picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml'
+picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml'
 picture-options='zoom'
 primary-color='000000'
 secondary-color='FFFFFF'