From 0e2603f6637cabb429182b82cb362ef3d9d4ce43 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 24 May 2020 11:24:33 -0400 Subject: [PATCH 1/2] Force --- src/git.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git.ts b/src/git.ts index aaacc7d6..663edb13 100644 --- a/src/git.ts +++ b/src/git.ts @@ -245,7 +245,7 @@ export async function deploy(action: ActionInterface): Promise { // Cleans up temporary files/folders and restores the git state. info('Running post deployment cleanup jobs… 🗑️') await execute( - `git worktree remove ${temporaryDeploymentDirectory}`, + `git worktree remove ${temporaryDeploymentDirectory} --force`, action.workspace ) await rmRF(temporaryDeploymentDirectory) From dd4a1cd6b8775a0065e9250882a44fe853bca8e1 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 24 May 2020 11:24:43 -0400 Subject: [PATCH 2/2] Lint --- src/constants.ts | 5 ++--- src/util.ts | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index a2a89ac8..00614be5 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -67,9 +67,8 @@ export const action: ActionInterface = { ? getInput('GIT_CONFIG_EMAIL') : pusher && pusher.email ? pusher.email - : `${ - process.env.GITHUB_ACTOR || 'github-pages-deploy-action' - }@users.noreply.github.com`, + : `${process.env.GITHUB_ACTOR || + 'github-pages-deploy-action'}@users.noreply.github.com`, gitHubToken: getInput('GITHUB_TOKEN'), name: !isNullOrUndefined(getInput('GIT_CONFIG_NAME')) ? getInput('GIT_CONFIG_NAME') diff --git a/src/util.ts b/src/util.ts index 735f6f5a..75454c21 100644 --- a/src/util.ts +++ b/src/util.ts @@ -19,9 +19,10 @@ export const generateTokenType = (action: ActionInterface): string => export const generateRepositoryPath = (action: ActionInterface): string => action.ssh ? `git@github.com:${action.repositoryName}` - : `https://${ - action.accessToken || `x-access-token:${action.gitHubToken}` - }@github.com/${action.repositoryName}.git` + : `https://${action.accessToken || + `x-access-token:${action.gitHubToken}`}@github.com/${ + action.repositoryName + }.git` /* Checks for the required tokens and formatting. Throws an error if any case is matched. */ export const hasRequiredParameters = (action: ActionInterface): void => {