From 590cf18ac1611f08ee7ccafa428116e2e850bef0 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2024 16:08:12 +0000
Subject: [PATCH 1/2] common: Use add-determinism as workraround for pyc mtime mismatch


See: https://gitlab.com/fedora/bootc/tracker/-/issues/3
See: https://pagure.io/workstation-ostree-config/pull-request/505
See: https://github.com/ostreedev/ostree/issues/1469

---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 519808c..5226d72 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -59,6 +59,8 @@ packages:
   # Kept for backward compatibility for AppImages
   # See: https://github.com/fedora-silverblue/issue-tracker/issues/589
   - fuse
+  # Workaround for https://github.com/ostreedev/ostree/issues/1469
+  - add-determinism
 
 selinux: true
 documentation: true
@@ -145,4 +147,7 @@ postprocess:
     # https://github.com/fedora-silverblue/issue-tracker/issues/532
     ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb
 
+    # Workaround for https://github.com/ostreedev/ostree/issues/1469
+    add-determinism -j --handler pyc-zero-mtime /usr
+
 postprocess-script: "postprocess.sh"

From 05a09c138a9543d008c847c171b8997a09d0c863 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 21 2024 15:32:13 +0000
Subject: [PATCH 2/2] ci: Temporarily skip building the base variant


The Fedora 40 cloud images are currently limited in disk space in
SoftwareFactory. Let's only check for dependencies for now until this is
fixed.

See: https://pagure.io/fedora-ci/general/issue/488

---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index 84d21e3..3ac51b0 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -52,10 +52,15 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
-    - name: Compose the base variant
-      ansible.builtin.command:
+    - name: Perform dependency resolution for the base variant
+      ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
-        cmd: just compose-legacy base
+        cmd: "just compose-dry-run base"
+
+    # - name: Compose the base variant
+    #   ansible.builtin.command:
+    #     chdir: "{{ zuul.project.src_dir }}"
+    #     cmd: just compose-legacy base
 
     - name: Check if any previous dependency resolution steps failed
       ansible.builtin.shell: