Deploy Production Code for Commit d418023 🚀

Author: JamesIves

lib/execute.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="node" />
 /** Wrapper around the GitHub toolkit exec command which returns the output.
  * Also allows you to easily toggle the current working directory.
  *
  * @param {string} cmd - The command to execute.
  * @param {string} cwd - The current working directory.
  * @param {boolean} silent - Determines if the in/out should be silenced or not.
  */
-export declare function execute(cmd: string, cwd: string, silent: boolean): Promise<any>;
-export declare function stdout(data: any): string | void;
+export declare function execute(cmd: string, cwd: string, silent: boolean): Promise<string>;
+export declare function stdout(data: Buffer | string): void;

lib/execute.js

@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stdout = exports.execute = void 0;
 const exec_1 = require("@actions/exec");
-let output;
+const buffer_1 = __importDefault(require("buffer"));
+let output = '';
 /** Wrapper around the GitHub toolkit exec command which returns the output.
  * Also allows you to easily toggle the current working directory.
  *
@@ -35,6 +39,8 @@ function execute(cmd, cwd, silent) {
 }
 exports.execute = execute;
 function stdout(data) {
-    output += data.toString().trim();
+    if (output.length < buffer_1.default.constants.MAX_STRING_LENGTH) {
+        output += data.toString().trim();
+    }
 }
 exports.stdout = stdout;

lib/git.js

@@ -76,7 +76,7 @@ function deploy(action) {
                     : ''} 🚀`;
             // Checks to see if the remote exists prior to deploying.
             const branchExists = action.isTest & constants_1.TestFlag.HAS_REMOTE_BRANCH ||
-                (yield execute_1.execute(`git ls-remote --heads ${action.repositoryPath} ${action.branch}`, action.workspace, action.silent));
+                (yield execute_1.execute(`git ls-remote --heads ${action.repositoryPath} refs/heads/${action.branch}`, action.workspace, action.silent));
             yield worktree_1.generateWorktree(action, temporaryDeploymentDirectory, branchExists);
             // Ensures that items that need to be excluded from the clean job get parsed.
             let excludes = '';
@@ -115,7 +115,9 @@ function deploy(action) {
             const hasFilesToCommit = action.isTest & constants_1.TestFlag.HAS_CHANGED_FILES ||
                 (yield execute_1.execute(checkGitStatus, `${action.workspace}/${temporaryDeploymentDirectory}`, true // This output is always silenced due to the large output it creates.
                 ));
-            if (!hasFilesToCommit) {
+            if ((!action.singleCommit && !hasFilesToCommit) ||
+                // Ignores the case where single commit is true with a target folder to prevent incorrect early exiting.
+                (action.singleCommit && !action.targetFolder && !hasFilesToCommit)) {
                 return constants_1.Status.SKIPPED;
             }
             // Commits to GitHub.
@@ -134,6 +136,11 @@ function deploy(action) {
         finally {
             // Cleans up temporary files/folders and restores the git state.
             core_1.info('Running post deployment cleanup jobs… 🗑️');
+            if (!action.singleCommit) {
+                core_1.info(`Resetting branch and removing artifacts…`);
+                yield execute_1.execute(`git checkout -B ${temporaryDeploymentBranch}`, `${action.workspace}/${temporaryDeploymentDirectory}`, action.silent);
+                yield execute_1.execute(`git branch -D ${action.branch} --force`, action.workspace, action.silent);
+            }
             yield execute_1.execute(`git worktree remove ${temporaryDeploymentDirectory} --force`, action.workspace, action.silent);
             yield io_1.rmRF(temporaryDeploymentDirectory);
         }

lib/util.d.ts

@@ -1,5 +1,5 @@
 import { ActionInterface } from './constants';
-export declare const isNullOrUndefined: (value: any) => boolean;
+export declare const isNullOrUndefined: (value: unknown) => boolean;
 export declare const generateTokenType: (action: ActionInterface) => string;
 export declare const generateRepositoryPath: (action: ActionInterface) => string;
 export declare const generateFolderPath: (action: ActionInterface) => string;

lib/worktree.d.ts

@@ -6,4 +6,4 @@ export declare class GitCheckout {
     constructor(branch: string);
     toString(): string;
 }
-export declare function generateWorktree(action: ActionInterface, worktreedir: string, branchExists: boolean): Promise<void>;
+export declare function generateWorktree(action: ActionInterface, worktreedir: string, branchExists: unknown): Promise<void>;