From 596a85239cbb89dcea3625cfc30c8f639bb22ed4 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 28 2025 10:41:42 +0000
Subject: [PATCH 1/2] ci/validate: Add COSMIC Atomic to CI checks


Add basic compose dependency checking for the new COSMIC Atomic variant.

---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index 4f953ef..54a0d24 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -92,6 +92,20 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
+    - name: Perform dependency resolution for COSMIC Atomic
+      ansible.builtin.shell:
+        chdir: "{{ zuul.project.src_dir }}"
+        cmd: "just compose-dry-run cosmic-atomic && touch .zuulci.cosmic-atomic"
+      # Still run the next step if this one fails
+      ignore_errors: true
+
+    - name: Perform dependency resolution for COSMIC Atomic (ostree classic)
+      ansible.builtin.shell:
+        chdir: "{{ zuul.project.src_dir }}"
+        cmd: "just compose-dry-run cosmic-atomic-ostree && touch .zuulci.cosmic-atomic-ostree"
+      # Still run the next step if this one fails
+      ignore_errors: true
+
     - name: Compose the base variant
       ansible.builtin.command:
         chdir: "{{ zuul.project.src_dir }}"
@@ -100,4 +114,4 @@
     - name: Check if any previous dependency resolution steps failed
       ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
-        cmd: "[[ -f .zuulci.comps ]] &&  [[ -f .zuulci.silverblue ]] &&  [[ -f .zuulci.silverblue-ostree ]] && [[ -f .zuulci.kinoite ]] && [[ -f .zuulci.kinoite-ostree ]] && [[ -f .zuulci.sway-atomic ]] && [[ -f .zuulci.sway-atomic-ostree ]] && [[ -f .zuulci.budgie-atomic ]]  && [[ -f .zuulci.budgie-atomic-ostree ]]"
+        cmd: "[[ -f .zuulci.comps ]] &&  [[ -f .zuulci.silverblue ]] &&  [[ -f .zuulci.silverblue-ostree ]] && [[ -f .zuulci.kinoite ]] && [[ -f .zuulci.kinoite-ostree ]] && [[ -f .zuulci.sway-atomic ]] && [[ -f .zuulci.sway-atomic-ostree ]] && [[ -f .zuulci.budgie-atomic ]]  && [[ -f .zuulci.budgie-atomic-ostree ]] && [[ -f .zuulci.cosmic-atomic ]]  && [[ -f .zuulci.cosmic-atomic-ostree ]]"

From 7205d398f320838087e2ee452d072125e1b7d47e Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 28 2025 11:55:24 +0000
Subject: [PATCH 2/2] cinnamon: Exclude GNOME Software


We can not use GNOME Software on non-Silverblue variants as it will
switch the variant to Silverblue on rebases.

See: https://pagure.io/fedora-comps/pull-request/1106

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 4921e7e..1a72bc6 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -278,6 +278,8 @@ desktop_exclude_list:
     - abrt-desktop
     - abrt-java-connector
     - dnfdragora-updater
+    # Will switch to Silverblue on rebases
+    - gnome-software
     # Non-critical apps -> Flatpak & toolbox
     - eom
     - gnome-calculator