#296 first commit

Accenture · Nov 18, 2022 · 41daf5a · 41daf5a
2 parents 734ddba + 11c4241
commit 41daf5a
Show file tree

Hide file tree

Showing 22 changed files with 2,916 additions and 2,265 deletions.
diff --git a/copado-function/app/Deploy.fn.js b/copado-function/app/Deploy.fn.js
@@ -286,6 +286,12 @@ async function run() {
  * handles downloading metadata
  */
 class Deploy {
+ /**
+ * used to ensure our working directory is clean before checking out branches
+ */
+ static stashChanges() {
+ Util.execCommand(null, [`git stash`], null);
+ }
  /**
  * retrieve the new values into the targets folder so it can be commited later.
  *
@@ -297,6 +303,10 @@ class Deploy {
  let gitAddArr;
  let gitDiffArr = [];
  try {
+ Log.info(
+ `Stashing changes made by mcdev.deploy() to avoid issues during branch checkout`
+ );
+ Deploy.stashChanges();
  Log.info('Switch to source branch to add updates for target');
  Copado.checkoutSrc(CONFIG.promotionBranch);
  } catch (ex) {