Update
This commit is contained in:
@@ -1,55 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Skript: Feature in Dev mergen mit Auswahl der Feature-Branches + Versions-Tag (Pflicht)
|
||||
|
||||
DEV_BRANCH="dev"
|
||||
|
||||
# Auflisten aller Feature-Branches (lokal und remote)
|
||||
echo "Verfügbare Feature-Branches:"
|
||||
FEATURE_BRANCHES=$(git branch -r | grep 'origin/feature/' | sed 's|origin/||')
|
||||
PS3="Bitte wähle einen Feature-Branch zum Mergen: "
|
||||
|
||||
BRANCH_ARRAY=($FEATURE_BRANCHES)
|
||||
|
||||
# Auswahlmenü
|
||||
select CHOSEN_BRANCH in "${BRANCH_ARRAY[@]}"; do
|
||||
if [[ -n "$CHOSEN_BRANCH" ]]; then
|
||||
FEATURE_BRANCH=$CHOSEN_BRANCH
|
||||
break
|
||||
else
|
||||
echo "Ungültige Auswahl. Bitte erneut versuchen."
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Ausgewählter Feature-Branch: $FEATURE_BRANCH"
|
||||
|
||||
# Versionsnummer verpflichtend abfragen
|
||||
while true; do
|
||||
read -p "Bitte Versionsnummer für Feature-Branch Tag eingeben (z.B. v0.2.0-featureX): " VERSION_TAG
|
||||
if [[ -n "$VERSION_TAG" ]]; then
|
||||
break
|
||||
else
|
||||
echo "Versionsnummer darf nicht leer sein. Bitte eingeben."
|
||||
fi
|
||||
done
|
||||
|
||||
# Dev aktuell holen
|
||||
git checkout $DEV_BRANCH
|
||||
git pull origin $DEV_BRANCH
|
||||
|
||||
# Feature-Branch aktuell holen
|
||||
git checkout $FEATURE_BRANCH
|
||||
git pull origin $FEATURE_BRANCH
|
||||
|
||||
# Tag auf Feature-Branch setzen
|
||||
git tag -a "$VERSION_TAG" -m "Feature $FEATURE_BRANCH Version $VERSION_TAG"
|
||||
git push origin "$VERSION_TAG"
|
||||
echo "Tag $VERSION_TAG für Feature $FEATURE_BRANCH gesetzt und gepusht."
|
||||
|
||||
# Merge Feature in Dev
|
||||
git checkout $DEV_BRANCH
|
||||
git merge --no-ff $FEATURE_BRANCH -m "Merge $FEATURE_BRANCH into $DEV_BRANCH"
|
||||
|
||||
# Dev pushen
|
||||
git push origin $DEV_BRANCH
|
||||
|
||||
echo "Feature $FEATURE_BRANCH wurde erfolgreich in $DEV_BRANCH gemerged."
|
||||
Reference in New Issue
Block a user