mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
Improve Rebase branch script (#4742)
* Improve Rebase branch script * Improve Rebase branch script * add comment
This commit is contained in:
committed by
Maurizio Vitale
parent
80da3e9932
commit
514b31d975
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
eval BRANCH_NAME=""
|
eval BRANCH_NAME=""
|
||||||
eval DIRECTORY="tmp"
|
eval DIRECTORY="tmp"
|
||||||
|
eval HEAD_SHA_BRANCH=""
|
||||||
|
|
||||||
show_help() {
|
show_help() {
|
||||||
echo "Usage: affected-folder.sh"
|
echo "Usage: affected-folder.sh"
|
||||||
@@ -38,5 +39,11 @@ then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ${FOLDER_NAME}
|
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
|
||||||
|
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
eval BRANCH_NAME=""
|
eval BRANCH_NAME=""
|
||||||
|
eval HEAD_SHA_BRANCH=""
|
||||||
eval DIRECTORY="tmp"
|
eval DIRECTORY="tmp"
|
||||||
eval GNU=false
|
eval GNU=false
|
||||||
|
|
||||||
@@ -41,10 +42,9 @@ then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#check if branch needs to be updated
|
||||||
./scripts/check-branch-updated.sh -b $BRANCH_NAME || exit 1;
|
./scripts/check-branch-updated.sh -b $BRANCH_NAME || exit 1;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# tmp folder doesn't exist.
|
# tmp folder doesn't exist.
|
||||||
if [ ! -d "$DIRECTORY" ]; then
|
if [ ! -d "$DIRECTORY" ]; then
|
||||||
#find affected libs
|
#find affected libs
|
||||||
@@ -52,6 +52,12 @@ if [ ! -d "$DIRECTORY" ]; then
|
|||||||
mkdir $DIRECTORY;
|
mkdir $DIRECTORY;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
HEAD_SHA_BRANCH="$(git merge-base origin/$BRANCH_NAME HEAD)"
|
||||||
|
|
||||||
|
if [ ! -f $DIRECTORY/deps.txt ]; then
|
||||||
|
npm run affected:libs -- $HEAD_SHA_BRANCH "HEAD" > $DIRECTORY/deps.txt
|
||||||
|
fi
|
||||||
|
|
||||||
cat $DIRECTORY/deps.txt
|
cat $DIRECTORY/deps.txt
|
||||||
#echo "extensions" > deps.txt
|
#echo "extensions" > deps.txt
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user