fix: Add removing workDir at the end

peaceiris · Feb 18, 2020 · 1dd092b · 1dd092b
1 parent 1c50baa
commit 1dd092b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/git-utils.ts b/src/git-utils.ts
@@ -38,7 +38,10 @@ export async function copyAssets(
   return;
 }
 
-export async function setRepo(inps: Inputs, remoteURL: string): Promise<void> {
+export async function setRepo(
+  inps: Inputs,
+  remoteURL: string
+): Promise<string> {
   const workDir = path.join(getHomeDir(), 'actions_github_pages');
   const publishDir = path.join(
     `${process.env.GITHUB_WORKSPACE}`,
@@ -51,7 +54,7 @@ export async function setRepo(inps: Inputs, remoteURL: string): Promise<void> {
     process.chdir(workDir);
     await createBranchForce(inps.PublishBranch);
     await copyAssets(publishDir, workDir);
-    return;
+    return workDir;
   }
 
   const result: CmdResult = {
@@ -89,7 +92,7 @@ export async function setRepo(inps: Inputs, remoteURL: string): Promise<void> {
       }
 
       await copyAssets(publishDir, workDir);
-      return;
+      return workDir;
     } else {
       throw new Error(`Failed to clone remote branch ${inps.PublishBranch}`);
     }
@@ -102,7 +105,7 @@ export async function setRepo(inps: Inputs, remoteURL: string): Promise<void> {
     process.chdir(workDir);
     await createBranchForce(inps.PublishBranch);
     await copyAssets(publishDir, workDir);
-    return;
+    return workDir;
   }
 }
 

diff --git a/src/main.ts b/src/main.ts
@@ -1,9 +1,11 @@
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
+import * as io from '@actions/io';
 import {Inputs} from './interfaces';
 import {getInputs} from './get-inputs';
 import {setTokens} from './set-tokens';
 import * as git from './git-utils';
+import {isObject} from 'util';
 
 export async function run(): Promise<void> {
   try {
@@ -14,7 +16,7 @@ export async function run(): Promise<void> {
     const remoteURL = await setTokens(inps);
     core.debug(`[INFO] remoteURL: ${remoteURL}`);
 
-    await git.setRepo(inps, remoteURL);
+    const workDir = await git.setRepo(inps, remoteURL);
 
     try {
       await exec.exec('git', ['remote', 'rm', 'origin']);
@@ -33,6 +35,8 @@ export async function run(): Promise<void> {
     await git.pushTag(inps.TagName, inps.TagMessage);
     core.info('[INFO] Action successfully completed');
 
+    io.rmRF(workDir);
+
     return;
   } catch (e) {
     throw new Error(e);