mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-03-13 05:46:56 +01:00
122 lines
3.2 KiB
Bash
Executable File
122 lines
3.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
param1="$1"
|
|
|
|
|
|
# Configuration des versions
|
|
START=14
|
|
END=23
|
|
DEV_DIR="dolibarr_dev"
|
|
DEV_BRANCH="develop"
|
|
|
|
|
|
if [ -z "$param1" ]; then
|
|
echo "Usage: $0 <pull|merge|all>"
|
|
echo
|
|
echo "Example:"
|
|
echo "$0 pull # For pull only"
|
|
echo "$0 merge # For merge only"
|
|
echo "$0 all # For pull then merge"
|
|
echo
|
|
exit 1
|
|
fi
|
|
|
|
if [ "x$param1" = "xall" ] || [ "x$param1" = "xpull" ]; then
|
|
echo "--- STEP Pull : Update directories (git pull) ---"
|
|
|
|
for (( i=$START; i<=$END; i++ ))
|
|
do
|
|
DIR="dolibarr_$i.0"
|
|
|
|
if [ -d "$DIR" ]; then
|
|
echo "*** Update of $DIR..."
|
|
cd "$DIR" || exit
|
|
|
|
# We want to be sure we are on good brnahc and we pull
|
|
git checkout "$i.0" && git pull
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "ERREUR : The pull on $DIR has failed. We stop here."
|
|
exit 1
|
|
fi
|
|
|
|
cd ..
|
|
else
|
|
echo "Warning : The directory $DIR does not exists, switch to next one."
|
|
fi
|
|
done
|
|
|
|
# Update branch dev
|
|
if [ -d "$DEV_DIR" ]; then
|
|
echo "*** Update of $DEV_DIR..."
|
|
cd "$DEV_DIR" || exit
|
|
git checkout "$DEV_BRANCH" && git pull || { echo "Error pull $DEV_DIR"; exit 1; }
|
|
cd ..
|
|
fi
|
|
fi
|
|
|
|
|
|
if [ "x$param1" = "xall" ] || [ "x$param1" = "xmerge" ]; then
|
|
echo -e "\n--- STEP Merge : Cascade of Merges (xx-1 -> xx) ---"
|
|
|
|
for (( i=$((START+1)); i<=$END; i++ ))
|
|
do
|
|
PREV=$((i-1))
|
|
CURRENT=$i
|
|
DIR_CURRENT="dolibarr_$CURRENT.0"
|
|
DIR_PREV="dolibarr_$PREV.0"
|
|
|
|
if [ -d "$DIR_CURRENT" ] && [ -d "$DIR_PREV" ]; then
|
|
echo "*** Merge of dolibarr_$PREV to dolibarr_$CURRENT..."
|
|
|
|
echo "Go on dir $DIR_CURRENT"
|
|
cd "$DIR_CURRENT" || exit
|
|
|
|
# Add previous directory to a local remote for the merge
|
|
# This allow to merge without the need of a common remote repository, which may not be the case here as we have only local clones.
|
|
REMOTE_NAME="local_prev"
|
|
git remote remove $REMOTE_NAME 2>/dev/null
|
|
git remote add $REMOTE_NAME "../$DIR_PREV"
|
|
git fetch $REMOTE_NAME
|
|
|
|
# Try to merge
|
|
git merge "$REMOTE_NAME/$PREV.0" -m "Automated merge from $PREV.0 to $CURRENT.0 by tool pullmerge.sh"
|
|
|
|
if [ $? -eq 0 ]; then
|
|
echo "Success on merge. Try to push..."
|
|
git push
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "ERROR : The push of $DIR_CURRENT has failed. We stop here."
|
|
exit 1
|
|
fi
|
|
else
|
|
echo "ERROR : Conflict or error on merge into $DIR_CURRENT. We stop here."
|
|
# Optionnel : git merge --abort pour laisser le repo propre
|
|
exit 1
|
|
fi
|
|
|
|
# Nettoyage du remote temporaire
|
|
git remote remove $REMOTE_NAME
|
|
cd ..
|
|
fi
|
|
done
|
|
|
|
if [ -d "$DEV_DIR" ] && [ -d "dolibarr_$END.0" ]; then
|
|
echo "*** Merge final of dolibarr_$END.0 vers $DEV_DIR..."
|
|
cd "$DEV_DIR" || exit
|
|
|
|
REMOTE_NAME="local_prev"
|
|
git remote remove $REMOTE_NAME 2>/dev/null
|
|
git remote add $REMOTE_NAME "../dolibarr_$END.0"
|
|
git fetch $REMOTE_NAME
|
|
|
|
git merge "$REMOTE_NAME/$END.0" -m "Automated merge from $END.0 to $DEV_BRANCH" && git push || exit 1
|
|
|
|
git remote remove $REMOTE_NAME
|
|
cd ..
|
|
fi
|
|
fi
|
|
|
|
echo -e "\nSuccess !"
|