Merge branch 'releases/v4' of https://github.com/JamesIves/github-pag…

…es-deploy-action into releases/v4

lib/constants.d.ts

@@ -1,9 +1,9 @@
 export declare enum TestFlag {
     NONE = 0,
-    HAS_CHANGED_FILES = 2,
-    HAS_REMOTE_BRANCH = 4,
-    UNABLE_TO_REMOVE_ORIGIN = 8,
-    UNABLE_TO_UNSET_GIT_CONFIG = 16,
+    HAS_CHANGED_FILES = 2,// Assume changes to commit.
+    HAS_REMOTE_BRANCH = 4,// Assume remote repository has existing commits.
+    UNABLE_TO_REMOVE_ORIGIN = 8,// Assume we can't remove origin.
+    UNABLE_TO_UNSET_GIT_CONFIG = 16,// Assume we can't remove previously set git configs.
     HAS_REJECTED_COMMIT = 32
 }
 export interface ActionInterface {

lib/constants.js

@@ -37,7 +37,7 @@ var TestFlag;
     TestFlag[TestFlag["UNABLE_TO_REMOVE_ORIGIN"] = 8] = "UNABLE_TO_REMOVE_ORIGIN";
     TestFlag[TestFlag["UNABLE_TO_UNSET_GIT_CONFIG"] = 16] = "UNABLE_TO_UNSET_GIT_CONFIG";
     TestFlag[TestFlag["HAS_REJECTED_COMMIT"] = 32] = "HAS_REJECTED_COMMIT"; // Assume commit rejection.
-})(TestFlag = exports.TestFlag || (exports.TestFlag = {}));
+})(TestFlag || (exports.TestFlag = TestFlag = {}));
 /* Required action data that gets initialized when running within the GitHub Actions environment. */
 exports.action = {
     folder: (0, core_1.getInput)('folder'),
@@ -102,14 +102,14 @@ var Status;
     Status["FAILED"] = "failed";
     Status["SKIPPED"] = "skipped";
     Status["RUNNING"] = "running";
-})(Status = exports.Status || (exports.Status = {}));
+})(Status || (exports.Status = Status = {}));
 /* Platform codes. */
 var OperatingSystems;
 (function (OperatingSystems) {
     OperatingSystems["LINUX"] = "Linux";
     OperatingSystems["WINDOWS"] = "Windows";
     OperatingSystems["MACOS"] = "macOS";
-})(OperatingSystems = exports.OperatingSystems || (exports.OperatingSystems = {}));
+})(OperatingSystems || (exports.OperatingSystems = OperatingSystems = {}));
 exports.SupportedOperatingSystems = [OperatingSystems.LINUX];
 /* Excluded files. */
 var DefaultExcludedFiles;
@@ -119,4 +119,4 @@ var DefaultExcludedFiles;
     DefaultExcludedFiles["SSH"] = ".ssh";
     DefaultExcludedFiles["GIT"] = ".git";
     DefaultExcludedFiles["GITHUB"] = ".github";
-})(DefaultExcludedFiles = exports.DefaultExcludedFiles || (exports.DefaultExcludedFiles = {}));
+})(DefaultExcludedFiles || (exports.DefaultExcludedFiles = DefaultExcludedFiles = {}));

lib/execute.js

@@ -25,8 +25,8 @@ const output = { stdout: '', stderr: '' };
  * @param {boolean} ignoreReturnCode - Determines whether to throw an error
  * on a non-zero exit status or to leave implementation up to the caller.
  */
-function execute(cmd, cwd, silent, ignoreReturnCode = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function execute(cmd_1, cwd_1, silent_1) {
+    return __awaiter(this, arguments, void 0, function* (cmd, cwd, silent, ignoreReturnCode = false) {
         output.stdout = '';
         output.stderr = '';
         yield (0, exec_1.exec)(cmd, [], {

lib/git.js

@@ -186,8 +186,10 @@ function deploy(action) {
                         (0, core_1.info)('Updates were rejected');
                     // If the push failed for any fatal reason other than being rejected,
                     // there is a problem
-                    if (!rejected && pushResult.stderr.trim().startsWith('fatal:'))
+                    if (!rejected &&
+                        pushResult.stderr.split(/\n/).some(s => s.trim().startsWith('fatal:'))) {
                         throw new Error(pushResult.stderr);
+                    }
                 } while (rejected);
             }
             (0, core_1.info)(`Changes committed to the ${action.branch} branch… 📦`);