From 71083801dfc5bc6dbcad969bfdc2d2ce749a5c82 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sat, 11 Feb 2023 12:43:14 +0100
Subject: [PATCH] feat: improved pr process, still a bit hacky

---
 modules/buildbot/buildbot_nix.py | 37 ++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/modules/buildbot/buildbot_nix.py b/modules/buildbot/buildbot_nix.py
index 1703faf..91dc6b5 100644
--- a/modules/buildbot/buildbot_nix.py
+++ b/modules/buildbot/buildbot_nix.py
@@ -16,7 +16,13 @@ from buildbot.process.results import ALL_RESULTS, statusToString
 from buildbot.steps.trigger import Trigger
 from twisted.internet import defer
 from buildbot.steps.source.github import GitHub
+from buildbot.process.results import FAILURE
+from buildbot.steps.master import SetProperty
 
+def failure(step):
+   if step.getProperty("GitFailed"):
+      return True
+   return False
 
 class BuildTrigger(Trigger):
     """
@@ -224,10 +230,38 @@ def nix_update_flake_config(
             alwaysUseLatest=True,
             method="clobber",
             submodules=True,
-            haltOnFailure=True,
             branch="update_flake_lock",
+            haltOnFailure=False
         )
     )
+
+    factory.addStep(SetProperty(property="GitFailed", value="failed", doStepIf=(lambda step: step.build.results == FAILURE)))
+
+    factory.addStep(
+            steps.Git(
+            repourl=url_with_secret,
+            alwaysUseLatest=True,
+            method="clobber",
+            submodules=True,
+            haltOnFailure=True,
+            branch="main",
+            doStepIf=failure
+        )
+    )
+    factory.addStep(steps.ShellCommand(
+            name="Creating branch",
+            command=[
+                "git",
+                "checkout",
+                "-b",
+                "update_flake_lock"
+            ],
+            haltOnFailure=True,
+            doStepIf=failure
+        )
+
+    )
+
     factory.addStep(
         steps.ShellCommand(
             name="Update flake",
@@ -305,7 +339,6 @@ def nix_eval_config(
     url_with_secret = util.Interpolate(
         f"https://git:%(secret:{github_token_secret})s@github.com/%(prop:project)s"
     )
-    factory.addStep(steps.ShellCommand(command=["echo", "test"]))
     factory.addStep(
         GitHub(
             logEnviron = False,