From 80da3e9932912ef209204e130d1dbca402b6d677 Mon Sep 17 00:00:00 2001
From: davidcanonieto <david.cano.nieto@gmail.com>
Date: Fri, 17 May 2019 15:03:22 +0100
Subject: [PATCH] [ADF-4569] Fix affected-libs.sh script (#4734)

* [ADF-4569] Fix affected-libs.sh script

* [ADF-4569] Create new script to check if branch is updated
---
 scripts/affected-folder.sh      | 14 +-------------
 scripts/affected-libs.sh        | 14 ++------------
 scripts/check-branch-updated.sh | 33 +++++++++++++++++++++++++++++++++
 scripts/smart-build.sh          |  2 --
 4 files changed, 36 insertions(+), 27 deletions(-)
 create mode 100755 scripts/check-branch-updated.sh

diff --git a/scripts/affected-folder.sh b/scripts/affected-folder.sh
index fd450c6b28..2c9a15b593 100755
--- a/scripts/affected-folder.sh
+++ b/scripts/affected-folder.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
 eval BRANCH_NAME=""
-eval HEAD_SHA_BRANCH=""
-eval SHA_2="HEAD"
 eval DIRECTORY="tmp"
 
 show_help() {
@@ -40,15 +38,5 @@ then
     exit 0
 fi
 
-if [ ! -f ./$DIRECTORY/devhead.txt ]; then
-    git merge-base origin/$BRANCH_NAME HEAD > ./$DIRECTORY/devhead.txt
-fi
-
-HEAD_SHA_BRANCH="$(git merge-base origin/$BRANCH_NAME HEAD)"
-#echo "Branch name $BRANCH_NAME HEAD sha " $HEAD_SHA_BRANCH
-
-if git diff --name-only $HEAD_SHA_BRANCH  HEAD | grep "^${FOLDER_NAME}" &> /dev/null
-then
-    echo ${FOLDER_NAME}
-fi
+echo ${FOLDER_NAME}
 
diff --git a/scripts/affected-libs.sh b/scripts/affected-libs.sh
index 52e8fc7805..bb36c9d557 100755
--- a/scripts/affected-libs.sh
+++ b/scripts/affected-libs.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
 eval BRANCH_NAME=""
-eval HEAD_SHA_BRANCH=""
-eval SHA_2="HEAD"
 eval DIRECTORY="tmp"
 eval GNU=false
 
@@ -43,13 +41,9 @@ then
     exit 0
 fi
 
-if [ ! -f ./$DIRECTORY/devhead.txt ]; then
-git merge-base origin/$BRANCH_NAME HEAD > ./$DIRECTORY/devhead.txt
-fi
+./scripts/check-branch-updated.sh -b $BRANCH_NAME || exit 1;
+
 
-HEAD_SHA_BRANCH="$(cat ./$DIRECTORY/devhead.txt)"
-echo ""
-echo "Branch name $BRANCH_NAME HEAD sha " $HEAD_SHA_BRANCH
 
 # tmp folder doesn't exist.
 if [ ! -d "$DIRECTORY" ]; then
@@ -58,10 +52,6 @@ if [ ! -d "$DIRECTORY" ]; then
   mkdir $DIRECTORY;
 fi
 
-if [ ! -f $DIRECTORY/deps.txt ]; then
-    npm run affected:libs -- $HEAD_SHA_BRANCH "HEAD" > $DIRECTORY/deps.txt || ( echo "This PR needs to be rebased"; exit 1 )
-fi
-
 cat $DIRECTORY/deps.txt
 #echo "extensions" > deps.txt
 
diff --git a/scripts/check-branch-updated.sh b/scripts/check-branch-updated.sh
new file mode 100755
index 0000000000..a7f11dce3d
--- /dev/null
+++ b/scripts/check-branch-updated.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+eval BRANCH_NAME=""
+
+branch_name(){
+    BRANCH_NAME=$1
+}
+
+show_help() {
+    echo "Usage: check-branch-updated.sh"
+    echo ""
+    echo "-b branch name"
+}
+
+while [[ $1  == -* ]]; do
+    case "$1" in
+      -b)  branch_name $2; shift 2;;
+      -*) echo "invalid option: $1" 1>&2; show_help; exit 0;;
+    esac
+done
+
+if [[ "$BRANCH_NAME" == "" ]]
+then
+    echo "The branch name is mandatory"
+    exit 0
+fi
+
+hash1=$(git show-ref --heads -s development)
+hash2=$(git merge-base development $BRANCH_NAME)
+[ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; }
+
+echo "Development branch HEAD sha " $hash1
+echo "$BRANCH_NAME branch HEAD sha " $hash2
diff --git a/scripts/smart-build.sh b/scripts/smart-build.sh
index 884ceff640..4406b2bbb6 100755
--- a/scripts/smart-build.sh
+++ b/scripts/smart-build.sh
@@ -39,8 +39,6 @@ else
  gnu=''
 fi
 
-git merge-base origin/$BRANCH_NAME HEAD > ./tmp/devhead.txt;
-
 #reset the tmp folder
 affected="$(./scripts/affected-libs.sh ${gnu[@]} -b "$BRANCH_NAME")"
 echo $affected