Patch: commit changes when the second patch fail

camptocamp · Jul 2, 2024 · cc3048c · cc3048c
1 parent 1d2c456
commit cc3048c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/github_app_geo_project/module/standard/patch.py b/github_app_geo_project/module/standard/patch.py
@@ -149,12 +149,13 @@ async def process(
                                 if proc.returncode != 0:
                                     message.title = f"Failed to apply the diff {artifact.name}"
                                     _LOGGER.warning(message)
-                                    return module.ProcessOutput(
-                                        success=False,
-                                        output={
-                                            "summary": "Failed to apply the diff, you should probably rebase your branch"
-                                        },
-                                    )
+                                    if not should_push:
+                                        return module.ProcessOutput(
+                                            success=False,
+                                            output={
+                                                "summary": "Failed to apply the diff, you should probably rebase your branch"
+                                            },
+                                        )
                                 message.title = f"Applied the diff {artifact.name}"
                                 _LOGGER.info(message)