Fix

gnknzm · Aug 31, 2024 · 1596b5e · 1596b5e
1 parent 1d66049
commit 1596b5e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/.github/scripts/acquire-lock.js b/.github/scripts/acquire-lock.js
@@ -6,6 +6,15 @@ function configureGit() {
     cp.execSync('git config --global user.name "github-actions[bot]"');
 }
 
+function checkoutBranch(branch) {
+    cp.execSync('git pull');
+    try {
+        cp.execFileSync('git', ['checkout', branch]);
+    } catch (e) {
+        cp.execFileSync('git', ['checkout', '-b', branch]);
+    }
+}
+
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -15,7 +24,7 @@ configureGit();
 (async () => {
     while (true) {
         try {
-            cp.execFileSync('git', ['checkout', '-b', 'workflow-lock']);
+            checkoutBranch('workflow-lock');
             cp.execSync('git commit --allow-empty -m "Acquire lock"');
             cp.execFileSync('git', ['push', '-u', 'origin', 'workflow-lock']);
             console.log("Acquired lock!");