ci: more fixes

scripts/ci/workflow.py

@@ -60,7 +60,6 @@ def short_commit():
 # ----------------------------------------------------------
 # BUILD NUMBER RESERVATION
 # ----------------------------------------------------------
-
 def reserve_build_number(repo, max_attempts=5):
     repo = Path(repo).resolve()
     version_json = repo / "version.json"
@@ -68,9 +67,14 @@ def reserve_build_number(repo, max_attempts=5):
     def utc_now():
         return datetime.datetime.now(datetime.UTC).strftime("%Y-%m-%dT%H:%M:%SZ")
 
-    def read():
+    def current_branch():
-        branch = runAndGet("git rev-parse --abbrev-ref HEAD", cwd=repo)
+        return runAndGet("git rev-parse --abbrev-ref HEAD", cwd=repo)
 
+    def sync_with_remote(branch):
+        run(f"git fetch --depth=1 origin {branch}", check=False, cwd=repo)
+        run(f"git reset --hard origin/{branch}", check=False, cwd=repo)
+
+    def read(branch):
         defaults = {
             "build": 0,
             "issued_at": utc_now(),
@@ -82,13 +86,10 @@ def reserve_build_number(repo, max_attempts=5):
         else:
             data = {}
 
-        # fill missing fields
         for k, v in defaults.items():
             data.setdefault(k, v)
 
-        # ensure tag always tracks current branch
         data["tag"] = branch
-
         version_json.write_text(json.dumps(data, indent=2) + "\n")
         return data
 
@@ -96,19 +97,23 @@ def reserve_build_number(repo, max_attempts=5):
         version_json.write_text(json.dumps(data, indent=2) + "\n")
 
     for attempt in range(max_attempts):
-        run("git fetch --depth=1 origin HEAD", check=False, cwd=repo)
+        branch = current_branch()
-        run("git reset --hard FETCH_HEAD", check=False, cwd=repo)
+        sync_with_remote(branch)
 
-        data = read()
+        data = read(branch)
         data["build"] += 1
         data["issued_at"] = utc_now()
 
         write(data)
 
         run("git add version.json", check=False, cwd=repo)
-        run(f"git commit -m '{data['tag']} - build no: {data['build']}' || true", check=False, cwd=repo)
+        run(
+            f"git commit -m '{branch} - build no: {data['build']}' || true",
+            check=False,
+            cwd=repo,
+        )
 
-        rc = subprocess.call("git push", shell=True, cwd=repo)
+        rc = subprocess.call(f"git push origin {branch}", shell=True, cwd=repo)
 
         if rc == 0:
             print(f"Reserved build #{data['build']}", file=sys.stderr)
@@ -528,6 +533,5 @@ def main():
         sys.stdout.write(str(result))
         sys.stdout.flush()
 
-
 if __name__ == "__main__":
     main()