From f95989809d20026a2238b303aad6ad1dc64019bf Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eromano@users.noreply.github.com>
Date: Tue, 26 Nov 2019 19:37:58 +0000
Subject: [PATCH] Improve scripts after release (#5288)

* update scripts problems

* improve script

* fix alignment
---
 .travis.yml                             |  4 ++--
 lib/cli/scripts/npm-publish.ts          | 21 +++++++++++++--------
 scripts/travis/update/update-project.sh |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b62336b645..065e41e896 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ stages:
   - name: Update Children Projects
     if: branch = master AND type = push OR (tag =~ .*beta.*)
   - name: Release beta tag
-    if: type = cron
+    if: type = cron OR branch = master
 
 addons:
     chrome: stable
@@ -71,7 +71,7 @@ jobs:
             - ./scripts/travis/release/release.sh
             - TAG_VERSION=$(./scripts/travis/deploy/tag-travis-branch.sh)
             - echo "Running the docker with tag" $TAG_VERSION
-            - ./node_modules/@alfresco/adf-cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION,$TAGS" --pathProject "$(pwd)"
+            - ./node_modules/@alfresco/adf-cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PAStSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION,$TAGS" --pathProject "$(pwd)"
 
 
         - stage: Unit test
diff --git a/lib/cli/scripts/npm-publish.ts b/lib/cli/scripts/npm-publish.ts
index 27bab80670..b0b546b67d 100644
--- a/lib/cli/scripts/npm-publish.ts
+++ b/lib/cli/scripts/npm-publish.ts
@@ -78,12 +78,11 @@ function removeNPMRC(args: PublishArgs, project: string) {
     logger.info(response);
 }
 
-export default function (args: PublishArgs) {
-
-    main(args);
+export default async function (args: PublishArgs) {
+    await main(args);
 }
 
-function main(args) {
+async function main(args) {
 
     program
         .version('0.1.0')
@@ -98,8 +97,14 @@ function main(args) {
         program.outputHelp();
     }
 
-    projects.forEach((project: string) => {
-        logger.info(`========Analyzing project: ${project} ========`);
-        npmPublish(args, project);
-    });
+    for (let i = 0; i < projects.length; i++) {
+        await sleep(120000);
+        logger.info(`========Analyzing project: ${projects[i]} ========`);
+        npmPublish(args, projects[i]);
+    }
+}
+
+async function sleep(ms: number) {
+    logger.info(`Waiting for ${ms} milliseconds...`);
+    return new Promise(resolve => setTimeout(resolve, ms));
 }
diff --git a/scripts/travis/update/update-project.sh b/scripts/travis/update/update-project.sh
index b4eb6aaaf6..c47141782e 100755
--- a/scripts/travis/update/update-project.sh
+++ b/scripts/travis/update/update-project.sh
@@ -63,7 +63,7 @@ if $GNU; then
     if [ $NAME_REPO == 'Alfresco/generator-ng2-alfresco-app' ] || [ $NAME_REPO == 'Alfresco/alfresco-modeler-app' ]; then
         ./scripts/update-version.sh -gnu -v $VERSION -vj $JS_VERSION
     else
-        npm install @alfresco/adf-cli@alpha
+        npm install @alfresco/adf-cli@alpha --no-save
         npx adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --vjs $JS_VERSION
     fi
 else