Merge pull request #197 from Mark-Simulacrum/sleep-before-fetch

Add delay before querying base ref
rust-lang · Sep 23, 2023 · 79d8b30 · 79d8b30
2 parents ce600b9 + 75980ad
commit 79d8b30
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/homu/main.py b/homu/main.py
@@ -912,6 +912,11 @@ def branch_equal_to_merge(git_cmd, state, branch):
 
 def create_merge(state, repo_cfg, branch, logger, git_cfg,
                  ensure_merge_equal=False):
+    # Add some delay to try to make sure the base repo fetch is accurate.
+    # It seems like in some cases we're getting the previous commit from GH,
+    # e.g., https://github.com/rust-lang/homu/issues/75#issuecomment-1729058969
+    # Hopefully a delay helps.
+    time.sleep(60)
     base_sha = state.get_repo().ref('heads/' + state.base_ref).object.sha
 
     state.refresh()