[ACA-4306] Testing - Add form widget ids in the SIMPLEAPP resources file (#6806)

* [ACA-4306] Testing - Add form widget ids in the SIMPLEAPP resources file

* downgrade nrwl workspace version

* Use the PR branch name and terminate

* Handle the error

* Revert downgrade nrwl workspace

* Remove the useless check on rebase and raise the exit 1

* Remove the script

* Use the HEAD and create a new variable for commit sha

Co-authored-by: Maurizio Vitale <maurizio.vitale@alfresco.com>
This commit is contained in:
arditdomi
2021-03-22 17:44:55 +00:00
committed by GitHub
parent 4e94176536
commit 2d257ea092
13 changed files with 33 additions and 52 deletions

View File

@@ -1,33 +0,0 @@
#!/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 develop)
hash2=$(git merge-base develop $BRANCH_NAME)
[ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; }
echo "Develop branch HEAD sha " $hash1
echo "$BRANCH_NAME branch HEAD sha " $hash2