From b5b1bc17a4cf554f96a485ed730538af02ce46c8 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter-evans@users.noreply.github.com>
Date: Sun, 19 Jul 2020 13:58:50 +0900
Subject: [PATCH] Remove branch-suffix input

---
 action.yml                 |  2 --
 dist/index.js              | 24 +-----------------------
 src/create-pull-request.ts | 25 -------------------------
 src/main.ts                |  3 +--
 4 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/action.yml b/action.yml
index 11dc68e..067db42 100644
--- a/action.yml
+++ b/action.yml
@@ -38,8 +38,6 @@ inputs:
     description: 'A fork of the checked out base repository to which the pull request branch will be pushed.'
   base:
     description: 'The pull request base branch.'
-  branch-suffix:
-    description: 'The branch suffix type.'
 outputs:
   pull-request-number:
     description: 'The pull request number'
diff --git a/dist/index.js b/dist/index.js
index 3139ee6..388209e 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1306,8 +1306,7 @@ function run() {
                 draft: core.getInput('draft') === 'true',
                 branch: core.getInput('branch'),
                 pushToFork: core.getInput('push-to-fork'),
-                base: core.getInput('base'),
-                branchSuffix: core.getInput('branch-suffix')
+                base: core.getInput('base')
             };
             core.debug(`Inputs: ${util_1.inspect(inputs)}`);
             yield create_pull_request_1.createPullRequest(inputs);
@@ -10666,27 +10665,6 @@ function createPullRequest(inputs) {
                 throw new Error(`Working base branch '${workingBase}' was created by this action. Unable to continue.`);
             }
             core.endGroup();
-            // Apply the branch suffix if set
-            if (inputs.branchSuffix) {
-                switch (inputs.branchSuffix) {
-                    case 'short-commit-hash':
-                        // Suffix with the short SHA1 hash
-                        inputs.branch = `${inputs.branch}-${yield git.revParse('HEAD', [
-                            '--short'
-                        ])}`;
-                        break;
-                    case 'timestamp':
-                        // Suffix with the current timestamp
-                        inputs.branch = `${inputs.branch}-${utils.secondsSinceEpoch()}`;
-                        break;
-                    case 'random':
-                        // Suffix with a 7 character random string
-                        inputs.branch = `${inputs.branch}-${utils.randomString()}`;
-                        break;
-                    default:
-                        throw new Error(`Branch suffix '${inputs.branchSuffix}' is not a valid value. Unable to continue.`);
-                }
-            }
             // Output head branch
             core.info(`Pull request branch to create or update set to '${inputs.branch}'`);
             // Determine the committer and author
diff --git a/src/create-pull-request.ts b/src/create-pull-request.ts
index fdf74b6..953ca84 100644
--- a/src/create-pull-request.ts
+++ b/src/create-pull-request.ts
@@ -29,7 +29,6 @@ export interface Inputs {
   branch: string
   pushToFork: string
   base: string
-  branchSuffix: string
 }
 
 export async function createPullRequest(inputs: Inputs): Promise<void> {
@@ -123,30 +122,6 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
     }
     core.endGroup()
 
-    // Apply the branch suffix if set
-    if (inputs.branchSuffix) {
-      switch (inputs.branchSuffix) {
-        case 'short-commit-hash':
-          // Suffix with the short SHA1 hash
-          inputs.branch = `${inputs.branch}-${await git.revParse('HEAD', [
-            '--short'
-          ])}`
-          break
-        case 'timestamp':
-          // Suffix with the current timestamp
-          inputs.branch = `${inputs.branch}-${utils.secondsSinceEpoch()}`
-          break
-        case 'random':
-          // Suffix with a 7 character random string
-          inputs.branch = `${inputs.branch}-${utils.randomString()}`
-          break
-        default:
-          throw new Error(
-            `Branch suffix '${inputs.branchSuffix}' is not a valid value. Unable to continue.`
-          )
-      }
-    }
-
     // Output head branch
     core.info(
       `Pull request branch to create or update set to '${inputs.branch}'`
diff --git a/src/main.ts b/src/main.ts
index 3f89ae6..14da30e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -21,8 +21,7 @@ async function run(): Promise<void> {
       draft: core.getInput('draft') === 'true',
       branch: core.getInput('branch'),
       pushToFork: core.getInput('push-to-fork'),
-      base: core.getInput('base'),
-      branchSuffix: core.getInput('branch-suffix')
+      base: core.getInput('base')
     }
     core.debug(`Inputs: ${inspect(inputs)}`)