build

Tickaroo · Dec 5, 2023 · 6a563c8 · 6a563c8
1 parent 25447c9
commit 6a563c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -24940,17 +24940,17 @@ var mergeBranches = async function(octokit, pulls, tempBranch) {
     await octokit.request("PATCH /repos/{owner}/{repo}/git/refs/{ref}", {
       owner: import_github2.context.repo.owner,
       repo: import_github2.context.repo.repo,
-      ref: `heads/${integrationBranchName}`,
-      sha: tempSha
+      ref: `refs/heads/${integrationBranchName}`,
+      sha: tempSha,
+      force: true
     });
   } catch (e) {
     console.log(`Creating branch ${integrationBranchName} from ${tempBranch} with commit sha: ${tempSha}.`);
     await octokit.request("POST /repos/{owner}/{repo}/git/refs", {
       owner: import_github2.context.repo.owner,
       repo: import_github2.context.repo.repo,
-      ref: `heads/${integrationBranchName}`,
-      sha: tempSha,
-      force: true
+      ref: `refs/heads/${integrationBranchName}`,
+      sha: tempSha
     });
   }
 };

diff --git a/src/merge.js b/src/merge.js
@@ -110,17 +110,17 @@ const mergeBranches = async function (octokit, pulls, tempBranch) {
         await octokit.request('PATCH /repos/{owner}/{repo}/git/refs/{ref}', {
             owner: context.repo.owner,
             repo: context.repo.repo,
-            ref: `heads/${integrationBranchName}`,
-            sha: tempSha
+            ref: `refs/heads/${integrationBranchName}`,
+            sha: tempSha,
+            force: true
         });
     } catch(e) {
         console.log(`Creating branch ${integrationBranchName} from ${tempBranch} with commit sha: ${tempSha}.`);
         await octokit.request('POST /repos/{owner}/{repo}/git/refs', {
             owner: context.repo.owner,
             repo: context.repo.repo,
-            ref: `heads/${integrationBranchName}`,
-            sha: tempSha,
-            force: true,
+            ref: `refs/heads/${integrationBranchName}`,
+            sha: tempSha
         });
     }
 };