Merge pull request #10312 from tannewt/sync_adabot_cp_org

eightycc · web-flow · commit 66093e89ebed · 2025-05-07T11:14:02.000-07:00
Fix cp.org release PR creation
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
@@ -173,6 +173,14 @@ def create_pr(changes, updated, git_info, user):
         changes["new_release"], boards, languages
     )
 
+    # Sync main so that the fork has the same commit sha1
+    sync_main = {"branch": "main"}
+    response = github.post(
+        "/repos/{}/circuitpython-org/merge-upstream".format(user), json=sync_main
+    )
+    if not response.ok:
+        raise SystemExit(f"unable to sync main: {response.text}")
+
     create_branch = {"ref": "refs/heads/" + branch_name, "sha": commit_sha}
     response = github.post("/repos/{}/circuitpython-org/git/refs".format(user), json=create_branch)
     if not response.ok and response.json()["message"] != "Reference already exists":
