Merge branch 'dev' into releases/v3

__tests__/git.test.ts

@@ -341,7 +341,7 @@ describe('git', () => {
       const response = await deploy(action)
 
       // Includes the call to generateBranch
-      expect(execute).toBeCalledTimes(13)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
       expect(response).toBe(Status.SUCCESS)
     })
@@ -361,7 +361,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateBranch
-      expect(execute).toBeCalledTimes(19)
+      expect(execute).toBeCalledTimes(18)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -382,7 +382,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateBranch
-      expect(execute).toBeCalledTimes(13)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -402,7 +402,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateBranch
-      expect(execute).toBeCalledTimes(13)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -421,7 +421,7 @@ describe('git', () => {
 
       await deploy(action)
 
-      expect(execute).toBeCalledTimes(13)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
       expect(mkdirP).toBeCalledTimes(1)
     })

__tests__/main.test.ts

@@ -64,7 +64,7 @@ describe('main', () => {
       }
     })
     await run(action)
-    expect(execute).toBeCalledTimes(19)
+    expect(execute).toBeCalledTimes(18)
     expect(rmRF).toBeCalledTimes(1)
     expect(exportVariable).toBeCalledTimes(1)
   })

src/constants.ts

@@ -67,8 +67,9 @@ 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')

src/git.ts

@@ -233,11 +233,6 @@ export async function deploy(action: ActionInterface): Promise<Status> {
       action.workspace
     )
 
-    await execute(
-      `git branch -D ${temporaryDeploymentBranch}`,
-      action.workspace
-    )
-
     return Status.SUCCESS
   } catch (error) {
     throw new Error(

src/lib.ts

@@ -33,9 +33,9 @@ export default async function run(
     info(
       `${
         status === Status.FAILED
-          ? 'Deployment Failed ❌'
+          ? 'Deployment failed! ❌'
           : status === Status.SUCCESS
-          ? 'Completed Deployment Successfully! ✅'
+          ? 'Completed deployment successfully! ✅'
           : 'There is nothing to commit. Exiting early… 📭'
       }`
     )

src/util.ts

@@ -19,10 +19,9 @@ export const generateTokenType = (action: ActionInterface): string =>
 export const generateRepositoryPath = (action: ActionInterface): string =>
   action.ssh
     ? `git@github.com:${action.repositoryName}`
-    : `https://${action.accessToken ||
+    : `https://${
-        `x-access-token:${action.gitHubToken}`}@github.com/${
+        action.accessToken || `x-access-token:${action.gitHubToken}`
-        action.repositoryName
+      }@github.com/${action.repositoryName}.git`
-      }.git`
 
 /* Checks for the required tokens and formatting. Throws an error if any case is matched. */
 export const hasRequiredParameters = (action: ActionInterface): void => {