From b71a7056ec865ddc8c2c30915a2cf6ecab40d4e1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 6 Oct 2025 11:00:30 +0200
Subject: [PATCH] Fix CI on screeshot recording

---
 .github/workflows/scripts/recordScreenshots.sh |  3 +++
 build.gradle.kts                               | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/scripts/recordScreenshots.sh b/.github/workflows/scripts/recordScreenshots.sh
index 963a3c908b..19469e69e3 100755
--- a/.github/workflows/scripts/recordScreenshots.sh
+++ b/.github/workflows/scripts/recordScreenshots.sh
@@ -56,6 +56,9 @@ echo "Deleting previous screenshots"
 echo "Record screenshots"
 ./gradlew recordPaparazziDebug --stacktrace $GRADLE_ARGS
 
+echo "Deleting previous screenshots"
+./gradlew removeOldScreenshots --stacktrace --warn $GRADLE_ARGS
+
 echo "Record screenshots (Compound)"
 ./gradlew :libraries:compound:recordRoborazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn $GRADLE_ARGS
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 484d43a929..b7662aeb56 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -181,19 +181,28 @@ tasks.register("runQualityChecks") {
 // Make sure to delete old screenshots before recording new ones
 subprojects {
     val snapshotsDir = File("${project.projectDir}/src/test/snapshots")
-    val snapshotsDir2 = File("${project.projectDir}/screenshots")
     val removeOldScreenshotsTask = tasks.register("removeOldSnapshots") {
-        onlyIf { snapshotsDir.exists() || snapshotsDir2.exists() }
+        onlyIf { snapshotsDir.exists() }
         doFirst {
             println("Delete previous screenshots located at $snapshotsDir\n")
             snapshotsDir.deleteRecursively()
-            println("Delete previous screenshots located at $snapshotsDir2\n")
-            snapshotsDir2.deleteRecursively()
         }
     }
     tasks.findByName("recordPaparazzi")?.dependsOn(removeOldScreenshotsTask)
     tasks.findByName("recordPaparazziDebug")?.dependsOn(removeOldScreenshotsTask)
     tasks.findByName("recordPaparazziRelease")?.dependsOn(removeOldScreenshotsTask)
+}
+
+// Make sure to delete old snapshot before recording new ones
+subprojects {
+    val screenshotsDir = File("${project.projectDir}/screenshots")
+    val removeOldScreenshotsTask = tasks.register("removeOldScreenshots") {
+        onlyIf { screenshotsDir.exists() }
+        doFirst {
+            println("Delete previous screenshots located at $screenshotsDir\n")
+            screenshotsDir.deleteRecursively()
+        }
+    }
     tasks.findByName("recordRoborazzi")?.dependsOn(removeOldScreenshotsTask)
     tasks.findByName("recordRoborazziDebug")?.dependsOn(removeOldScreenshotsTask)
     tasks.findByName("recordRoborazziRelease")?.dependsOn(removeOldScreenshotsTask)