Deploy Production Code for Commit 77237a3 🚀

Author: JamesIves

lib/constants.d.ts

@@ -27,6 +27,8 @@ export interface ActionInterface {
     folderPath?: string;
     /** Whether to force-push or attempt to merge existing changes. */
     force?: boolean;
+    /** How many times to attempt to merge existing changes into the remote HEAD. */
+    attemptLimit?: number;
     /** Determines test scenarios the action is running in. */
     isTest: TestFlag;
     /** The git config name. */

lib/constants.js

@@ -51,6 +51,9 @@ exports.action = {
     force: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('force'))
         ? (0, core_1.getInput)('force').toLowerCase() === 'true'
         : true,
+    attemptLimit: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('attempt-limit'))
+        ? parseInt((0, core_1.getInput)('attempt-limit'), 10)
+        : 3,
     clean: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('clean'))
         ? (0, core_1.getInput)('clean').toLowerCase() === 'true'
         : false,

lib/git.js

@@ -114,7 +114,7 @@ function deploy(action) {
               Pushes all of the build files into the deployment directory.
               Allows the user to specify the root if '.' is provided.
               rsync is used to prevent file duplication. */
-            yield (0, execute_1.execute)(`rsync -q -av --checksum --progress ${action.folderPath}/. ${action.targetFolder
+            yield (0, execute_1.execute)(`rsync -q -av --checksum --progress --mkpath ${action.folderPath}/. ${action.targetFolder
                 ? `${temporaryDeploymentDirectory}/${action.targetFolder}`
                 : temporaryDeploymentDirectory} ${action.clean
                 ? `--delete ${excludes} ${!fs_1.default.existsSync(`${action.folderPath}/${constants_1.DefaultExcludedFiles.CNAME}`)
@@ -159,15 +159,15 @@ function deploy(action) {
                 yield (0, execute_1.execute)(`git push --force ${action.repositoryPath} ${temporaryDeploymentBranch}:${action.branch}`, `${action.workspace}/${temporaryDeploymentDirectory}`, action.silent);
             }
             else {
-                const ATTEMPT_LIMIT = 3;
+                const attemptLimit = action.attemptLimit || 3;
                 // Attempt to push our changes, but fetch + rebase if there were
                 // other changes added in the meantime
                 let attempt = 0;
                 // Keep track of whether the most recent attempt was rejected
                 let rejected = false;
                 do {
                     attempt++;
-                    if (attempt > ATTEMPT_LIMIT)
+                    if (attempt > attemptLimit)
                         throw new Error(`Attempt limit exceeded`);
                     // Handle rejection for the previous attempt first such that, on
                     // the final attempt, time is not wasted rebasing it when it will
@@ -178,7 +178,7 @@ function deploy(action) {
                         (0, core_1.info)(`Rebasing this deployment onto ${action.branch}…`);
                         yield (0, execute_1.execute)(`git rebase ${action.branch} ${temporaryDeploymentBranch}`, `${action.workspace}/${temporaryDeploymentDirectory}`, action.silent);
                     }
-                    (0, core_1.info)(`Pushing changes… (attempt ${attempt} of ${ATTEMPT_LIMIT})`);
+                    (0, core_1.info)(`Pushing changes… (attempt ${attempt} of ${attemptLimit})`);
                     const pushResult = yield (0, execute_1.execute)(`git push --porcelain ${action.repositoryPath} ${temporaryDeploymentBranch}:${action.branch}`, `${action.workspace}/${temporaryDeploymentDirectory}`, action.silent, true // Ignore non-zero exit status
                     );
                     rejected =