Merge release/1.2.0 into master

yanamura · Aug 30, 2020 · 8444c7c · 8444c7c
2 parents a48290f + e7cff3e
commit 8444c7c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,9 @@ If you're using `release branch` or `hotfix branch` of [gitflow-workflow](https:
         ### develop branch name. default: develop (optional).
         develop_branch: 'dev'
 
+        ### main branch name. default: master (optional).
+        main_branch: 'main'
+
         ### tag name which tagged to master.(optional)
         ### ex. v1.1.0
         tag: v${{ steps.extract_tag.outputs.tag }}

diff --git a/action.yml b/action.yml
@@ -11,6 +11,9 @@ inputs:
   develop_branch:
     description: 'develop branch name'
     default: 'develop'
+  main_branch:
+    description: 'main branch name'
+    default: 'master'
   tag:
     description: 'tag name'
 runs:

diff --git a/dist/index.js b/dist/index.js
@@ -3531,11 +3531,13 @@ function run() {
         const branch = core.getInput('branch');
         core.info(`branch name=${branch}`);
         let newMasterSha = '';
+        const mainBranch = core.getInput('main_branch');
+        core.info(`main branch name=${mainBranch}`);
         try {
-            newMasterSha = yield merge(branch, 'master');
+            newMasterSha = yield merge(branch, mainBranch);
         }
         catch (error) {
-            core.setFailed(`master merge failed::${error.message}`);
+            core.setFailed(`${mainBranch} merge failed::${error.message}`);
         }
         const tag = core.getInput('tag');
         if (tag) {

diff --git a/src/main.ts b/src/main.ts
@@ -28,10 +28,12 @@ async function run(): Promise<void> {
   core.info(`branch name=${branch}`)
 
   let newMasterSha = ''
+  const mainBranch: string = core.getInput('main_branch')
+  core.info(`main branch name=${mainBranch}`)
   try {
-    newMasterSha = await merge(branch, 'master')
+    newMasterSha = await merge(branch, mainBranch)
   } catch (error) {
-    core.setFailed(`master merge failed::${error.message}`)
+    core.setFailed(`${mainBranch} merge failed::${error.message}`)
   }
 
   const tag: string = core.getInput('tag')