Merge release/1.0.0 into master

yanamura · May 24, 2020 · 4225579 · 4225579
2 parents 2e16aec + 5c0ea60
commit 4225579
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,9 +1,9 @@
-name: "build-test"
+name: "merge-test"
 on: # merge release branch when pushed
   pull_request:
   push:
     branches:
-      - 'release-*'
+      - 'release/*'
 
 jobs:
   test:
@@ -18,7 +18,7 @@ jobs:
       shell: bash
       run: |
         branch=${{ steps.extract_branch.outputs.branch }}
-        echo "##[set-output name=tag;]$(echo ${branch#release-})"
+        echo "##[set-output name=tag;]$(echo ${branch#release/})"
       id: extract_tag
     - uses: ./
       with: 

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This action merge specified branch to develop and master.
       shell: bash
       run: |
         branch=${{ steps.extract_branch.outputs.branch }}
-        echo "##[set-output name=tag;]$(echo ${branch#release-})"
+        echo "##[set-output name=tag;]$(echo ${branch#release/})"
       id: extract_tag
     - uses: ./
       with: 

diff --git a/action.yml b/action.yml
@@ -13,3 +13,6 @@ inputs:
 runs:
   using: 'node12'
   main: 'dist/index.js'
+branding:
+  icon: "git-merge"
+  color: "black"