From b326cc25ed8ad7176c9b9eb3838b3f4c11fe68cf Mon Sep 17 00:00:00 2001
From: Ryan Brue <ryanbrue.dev@gmail.com>
Date: Mon, 3 Nov 2025 21:08:59 -0600
Subject: [PATCH] Add working desktop file validation as CI action

Ubuntu 24.04 does not have the updated desktop-file-utils with support
for the COSMIC keyword (>= 0.28). Use Ubuntu 25.10 for this.
---
 .github/workflows/ci.yml                     |  4 +--
 .github/workflows/validate-desktop-files.yml | 36 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/validate-desktop-files.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1eb51ee..990edb0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,8 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt-get update; sudo apt-get install desktop-file-utils libclang-dev libglib2.0-dev libxkbcommon-dev
-      # Disable until GitHub Actions uses Ubuntu 26.04.
-      # - run: desktop-file-validate --no-hints ./res/com.system76.CosmicFiles.desktop
+      - run: sudo apt-get update; sudo apt-get install libclang-dev libglib2.0-dev libxkbcommon-dev
       - run: rustup update stable && rustup default stable
       - run: cargo test --verbose
diff --git a/.github/workflows/validate-desktop-files.yml b/.github/workflows/validate-desktop-files.yml
new file mode 100644
index 0000000..516e908
--- /dev/null
+++ b/.github/workflows/validate-desktop-files.yml
@@ -0,0 +1,36 @@
+name: Validate .desktop files
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:25.10
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install desktop-file-utils
+        run: |
+          apt-get update
+          apt-get install -y desktop-file-utils findutils
+
+      - name: Validate .desktop files
+        run: |
+          set -e
+          echo "Checking for .desktop files..."
+          files=$(find . -type f -name "*.desktop")
+          if [ -z "$files" ]; then
+            echo "No .desktop files found."
+            exit 0
+          fi
+
+          echo "$files" | while read -r file; do
+            echo "Validating: $file"
+            desktop-file-validate "$file"
+          done