From 6d74177c08e522fce56e2bf272195bed0c661d15 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 24 May 2020 12:49:54 -0400 Subject: [PATCH 1/2] Randomizes deployment branch name --- src/git.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/git.ts b/src/git.ts index 663edb13..1f49ef27 100644 --- a/src/git.ts +++ b/src/git.ts @@ -93,8 +93,10 @@ export async function generateBranch(action: ActionInterface): Promise { /* Runs the necessary steps to make the deployment. */ export async function deploy(action: ActionInterface): Promise { - const temporaryDeploymentDirectory = 'gh-action-temp-deployment-folder' - const temporaryDeploymentBranch = 'gh-action-temp-deployment-branch' + const temporaryDeploymentDirectory = 'github-pages-deploy-action-temp-deployment-folder' + const temporaryDeploymentBranch = `github-pages-deploy-action/${Math.random() + .toString(36) + .substr(2, 9)}` info('Starting to commit changes…') From df054c018daad8cf87e69e6a4622900d1a0a4ff5 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 24 May 2020 12:50:10 -0400 Subject: [PATCH 2/2] Update git.ts --- src/git.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/git.ts b/src/git.ts index 1f49ef27..13e82876 100644 --- a/src/git.ts +++ b/src/git.ts @@ -93,7 +93,8 @@ export async function generateBranch(action: ActionInterface): Promise { /* Runs the necessary steps to make the deployment. */ export async function deploy(action: ActionInterface): Promise { - const temporaryDeploymentDirectory = 'github-pages-deploy-action-temp-deployment-folder' + const temporaryDeploymentDirectory = + 'github-pages-deploy-action-temp-deployment-folder' const temporaryDeploymentBranch = `github-pages-deploy-action/${Math.random() .toString(36) .substr(2, 9)}`