From d03e5703ff8a9c0e20b93cf261620031bed8585d Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Fri, 16 Jul 2021 09:20:06 +0200 Subject: [PATCH] master est maintenant candidat --- makepkg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/makepkg b/makepkg index d3b9ad0..6acc5d8 100755 --- a/makepkg +++ b/makepkg @@ -5,6 +5,7 @@ GITPACKAGE=~/git/eole/git-package/git-package export EDITOR=/bin/true MASTER=2.8.1 +MASTER_DEV=false MASTER_INSTABLE=2.8 INSTABLE_27=2.7.3 @@ -15,25 +16,25 @@ CURRENT_SUBBR=$(echo "$CURRENT_REF" | awk -F'/' '{ print $4 }') echo $CURRENT_BRANCH if [ "$CURRENT_BRANCH" = "master" ]; then VERSION=$MASTER + ORI_BR=master else VERSION=$CURRENT_BRANCH if [ ! "$CURRENT_SUBBR" = 'master' ]; then echo "impossible de déterminer la branche" exit 1 fi + ORI_BR=$VERSION/master fi -echo "attention version $VERSION" set -e -if [ $VERSION = $MASTER ]; then - ORI_BR=master +if [ $MASTER_DEV = true ] && [ $VERSION = $MASTER ]; then DEPOT=eole-$MASTER_INSTABLE/unstable elif [ $VERSION = $INSTABLE_27 ]; then ORI_BR=$VERSION/master DEPOT=eole-2.7/unstable else - ORI_BR=$VERSION/master DEPOT=eole-$VERSION/proposed-updates fi +echo "attention version $VERSION ($DEPOT)" DIST_BR=dist/eole/$VERSION/master git push git checkout $DIST_BR