Fix(GitHub Actions): Rebase fails and falls back to merge

techor-dev · Aug 14, 2023 · 21056bc · 21056bc
1 parent ab31fa7
commit 21056bc
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/packages/github-actions/src/sync-dev-branches.js b/packages/github-actions/src/sync-dev-branches.js
@@ -1,16 +1,23 @@
 const core = require('@actions/core')
 const checkBranchExists = require('./check-branch-exist')
 const rebase = require('./rebase')
+const merge = require('./merge')
 
 module.exports = async function syncDevBranches() {
-    try {
-        const currentBranchName = process.env.GITHUB_REF_NAME
-        const targetBranchName = `dev/${currentBranchName}`
-        if (await checkBranchExists(targetBranchName)) {
+    const currentBranchName = process.env.GITHUB_REF_NAME
+    const targetBranchName = `dev/${currentBranchName}`
+    if (await checkBranchExists(targetBranchName)) {
+        try {
             await rebase(targetBranchName)
+        } catch (error) {
+            console.error('Rebase failed, trying merge')
+            console.error(error)
+            try {
+                await merge(targetBranchName)
+            } catch (error) {
+                core.setOutput('error', error.message)
+                core.setFailed(error.message)
+            }
         }
-    } catch (error) {
-        core.setOutput('error', error.message)
-        core.setFailed(error.message)
     }
 }