up

.github/workflows/test.yml

@@ -20,4 +20,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: test

README.md

@@ -1,34 +1,14 @@
-# action-delete-branch
+# Delete branch Github Action
 
-This action simply deletes a branch from origin repository
+An action that simply deletes a branch from repository.
 
 ## Usage
 
 ```yaml
-- uses: dawidd6/action-delete-branch@master
-  env:
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+- name: Delete PR head branch
+  uses: dawidd6/action-delete-branch@master
   with:
-    branch: xyz
-```
-
-```yaml
-# works only if tested commit is referenced to pull request or issue
-# PR_NUMBER is replaced by pull request number
-- uses: dawidd6/action-delete-branch@master
-  env:
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  with:
-    branch: xyz-PR_NUMBER
-    be_kind: true
-```
-
-```yaml
-# works only if tested commit is referenced to pull request or issue
-# PR_HEAD_BRANCH is replaced by pull request head branch
-- uses: dawidd6/action-delete-branch@master
-  env:
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  with:
-    branch: PR_HEAD_BRANCH
+    github_token: ${{ secrets.GITHUB_TOKEN }}
+    branch: ${{ github.pull_request.head.ref }}
+    be_kind: true # don't fail on errors
 ```

action.yml

@@ -1,15 +1,20 @@
-name: 'delete-branch'
-description: 'Delete branch'
-author: 'dawidd6'
+name: delete-branch
+description: Delete branch
+author: dawidd6
+branding:
+  icon: git-branch
+  color: red
 inputs:
+  github_token:
+    description: Github token
+    required: true
   branch:
-    description: 'Branch name to delete'
+    description: Branch name to delete
     required: true
-    default: ''
   be_kind:
-    description: 'Be kind and do not scream if an exception occurs'
+    description: Be kind and do not scream if an exception occurs
     required: false
     default: false
 runs:
-  using: 'docker'
-  image: 'Dockerfile'
+  using: docker
+  image: Dockerfile

entrypoint.rb

@@ -6,21 +6,11 @@
 
 # Github
 repo = ENV["GITHUB_REPOSITORY"]
-token = ENV["GITHUB_TOKEN"]
-event_path = ENV["GITHUB_EVENT_PATH"]
-
-# Event
-json = File.read(event_path)
-payload = JSON.parse(json)
-pr = payload["pull_request"]
-pr_number = pr["number"] unless pr.nil?
-pr_head_branch = pr["head"]["ref"] unless pr.nil?
 
 # Inputs
 be_kind = ENV["INPUT_BE_KIND"]
 branch = ENV["INPUT_BRANCH"]
-branch = branch.sub("PR_NUMBER", pr_number.to_s) unless pr_number.nil?
-branch = branch.sub("PR_HEAD_BRANCH", pr_head_branch.to_s) unless pr_head_branch.nil?
+token = ENV["INPUT_GITHUB_TOKEN"]
 
 # Main
 begin
@@ -30,9 +20,9 @@
     puts "==> Branch \"#{branch}\" deleted successfully"
   else
     puts "==> Branch \"#{branch}\" deletion failure"
-    exit(1)
+    exit(1) unless be_kind
   end
-rescue StandardError
-  puts "==> Branch \"#{branch}\" not found"
+rescue StandardError => e
+  puts "==> Error: #{e.message}"
   exit(1) unless be_kind
 end