Removes the worktree (JamesIves#309)

JamesIves · web-flow · commit 0657078fb041 · 2020-05-24T10:57:49.000-04:00
* Removes the worktree

* Tests
diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
@@ -341,7 +341,7 @@ describe('git', () => {
       const response = await deploy(action)
 
       // Includes the call to generateBranch
-      expect(execute).toBeCalledTimes(11)
+      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(17)
+      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(11)
+      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(11)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -421,7 +421,7 @@ describe('git', () => {
 
       await deploy(action)
 
-      expect(execute).toBeCalledTimes(11)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
       expect(mkdirP).toBeCalledTimes(1)
     })
@@ -439,7 +439,7 @@ describe('git', () => {
       })
 
       const response = await deploy(action)
-      expect(execute).toBeCalledTimes(12)
+      expect(execute).toBeCalledTimes(13)
       expect(rmRF).toBeCalledTimes(1)
       expect(response).toBe(Status.SKIPPED)
     })
@@ -461,7 +461,7 @@ describe('git', () => {
       try {
         await deploy(action)
       } catch (e) {
-        expect(execute).toBeCalledTimes(0)
+        expect(execute).toBeCalledTimes(1)
         expect(rmRF).toBeCalledTimes(1)
         expect(e.message).toMatch(
           'The deploy step encountered an error: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌'
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -47,7 +47,7 @@ describe('main', () => {
       debug: true
     })
     await run(action)
-    expect(execute).toBeCalledTimes(18)
+    expect(execute).toBeCalledTimes(19)
     expect(rmRF).toBeCalledTimes(1)
     expect(exportVariable).toBeCalledTimes(1)
   })
@@ -64,7 +64,7 @@ describe('main', () => {
       }
     })
     await run(action)
-    expect(execute).toBeCalledTimes(17)
+    expect(execute).toBeCalledTimes(18)
     expect(rmRF).toBeCalledTimes(1)
     expect(exportVariable).toBeCalledTimes(1)
   })
diff --git a/src/git.ts b/src/git.ts
@@ -246,6 +246,10 @@ export async function deploy(action: ActionInterface): Promise<Status> {
     )
   } finally {
     // Ensures the deployment directory is safely removed after each deployment.
+    await execute(
+      `git worktree remove ${temporaryDeploymentDirectory}`,
+      action.workspace
+    )
     await rmRF(temporaryDeploymentDirectory)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,10 @@ export async function deploy(action: ActionInterface): Promise<Status> {`
`246`	`246`	`)`
`247`	`247`	`} finally {`
`248`	`248`	`// Ensures the deployment directory is safely removed after each deployment.`
	`249`	`+ await execute(`
	`250`	+ `git worktree remove ${temporaryDeploymentDirectory}`,
	`251`	`+ action.workspace`
	`252`	`+ )`
`249`	`253`	`await rmRF(temporaryDeploymentDirectory)`
`250`	`254`	`}`
`251`	`255`	`}`