Merge branch 'master' of github.com:devmasx/merge-branch

Author: MiguelSavignano

README.md

@@ -20,10 +20,32 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Merge by labeled
-        uses: devmasx/merge-branch@v1.0.0
+        uses: devmasx/merge-branch@v1.1.0
         with:
           label_name: 'merged in develop'
           target_branch: 'develop'
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 ```
+
+## On any github event
+
+```yaml
+name: Merge staging branch to uat
+on:
+  push:
+    branches:
+      - 'staging'
+jobs:
+  merge-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Merge to uat branch
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          target_branch: 'uat'
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+```

action.yml

@@ -1,6 +1,17 @@
 name: 'Merge branch'
 description: 'A GitHub Action that merge PR branch to other branchs'
 author: Miguel Savignano
+inputs:
+  type:
+    type: 'labeled | now'
+    required: false
+    default: 'labeled'
+  label_name:
+    description: 'PR Label name'
+    required: false
+  target_branch:
+    description: 'The name of target branch to merge'
+    required: true
 runs:
   using: 'docker'
   image: 'Dockerfile'

lib/adapters/push_adapter.rb renamed to lib/adapters/now_adapter.rb

@@ -1,4 +1,4 @@
-class PushAdapter
+class NowAdapter
   def initialize(github_event, target_branch)
     @event = github_event
     @target_branch = target_branch

lib/index.rb

@@ -8,7 +8,7 @@
 @github_token = ENV['GITHUB_TOKEN']
 @target_branch = ENV['INPUT_TARGET_BRANCH']
 @label_name = ENV['INPUT_LABEL_NAME']
-@type = ENV['INPUT_TYPE'] || 'labeled' # labeled | comment | push
+@type = ENV['INPUT_TYPE'] || 'labeled' # labeled | comment | now
 
 service = MergeBrachService.new(
   event: @event, type: @type, target_branch: @target_branch, label_name: @label_name

lib/services/merge_branch_service.rb

@@ -1,10 +1,11 @@
 require_relative '../adapters/labeled_adapter'
-require_relative '../adapters/push_adapter'
+require_relative '../adapters/now_adapter'
 
 class MergeBrachService
 
   def initialize(inputs)
     @inputs = inputs
+    @inputs[:type] = 'labeled' unless @inputs[:type]
   end
 
   def ensure_target_branch
@@ -20,10 +21,12 @@ def ensure_target_branch
 
   def build_adapter
     case @inputs[:type]
-    when 'push'
-      PushAdapter.new(@inputs[:event], @inputs[:target_branch])
+    when 'now'
+      NowAdapter.new(@inputs[:event], @inputs[:target_branch])
     when 'labeled'
       LabeledAdapter.new(@inputs[:event], @inputs[:target_branch], @inputs[:label_name])
+    else
+      raise "Invalid type #{@inputs[:type]}"
     end
   end
 end

spec/merge_brach_service_spec.rb

@@ -1,10 +1,21 @@
 require_relative '../lib/services/merge_branch_service'
 
 describe MergeBrachService do
+  context "with invalid type" do
+    let(:inputs) {
+      { type: 'invalid_type', event: {}, target_branch: 'develop' }
+    }
+
+    it "#target_branch" do
+      service = MergeBrachService.new(inputs)
+      expect{ service.ensure_target_branch }.to raise_error()
+    end
+  end
+
   context "with push" do
     let(:target_branch) { 'develop' }
     let(:inputs) {
-      { type: 'push', event: {}, target_branch: target_branch }
+      { type: 'now', event: {}, target_branch: target_branch }
     }
 
     it "#target_branch" do
@@ -18,7 +29,7 @@
     let(:target_branch) { 'develop' }
     let(:event) { { 'action' => 'labeled', 'label' => { 'name' => label_name } } }
     let(:inputs) {
-      { type: 'labeled', event: event, target_branch: target_branch, label_name: label_name }
+      { event: event, target_branch: target_branch, label_name: label_name }
     }
 
     context "match label" do