diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3454489..b1096ac 100644 --- 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 index f877ad1..7397dea 100644 --- 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 index 3be0e32..c3549a7 100644 --- a/action.yml +++ b/action.yml @@ -13,3 +13,6 @@ inputs: runs: using: 'node12' main: 'dist/index.js' +branding: + icon: "git-merge" + color: "black" \ No newline at end of file