From a5141b483b00c0695d42e1475a6b7202651ef190 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 31 Aug 2020 14:25:55 +0000 Subject: [PATCH] We also build stable/testing from the dev branch now --- ynh-build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ynh-build b/ynh-build index 3063a98..cfc0609 100755 --- a/ynh-build +++ b/ynh-build @@ -3,7 +3,7 @@ readonly THISSCRIPT=$0 readonly PROJECT=$1 readonly BRANCH=$2 -readonly DISTRIB="stretch" +readonly DISTRIB="buster" readonly VERSION=$3 readonly TAG=$(echo "debian/$VERSION" | tr '~' '-') @@ -37,7 +37,7 @@ function validate_arguments() { [[ $PROJECT =~ ^yunohost|yunohost-admin|moulinette|SSOwat$ ]] || critical "Invalid project $PROJECT" [[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH" - [[ $DISTRIB =~ ^stretch$ ]] || critical "Invalid distribution $DISTRIB" + [[ $DISTRIB =~ ^stretch|buster$ ]] || critical "Invalid distribution $DISTRIB" [[ ! -z "$VERSION" ]] || critical "Invalid version $VERSION" [[ "$(tty)" != "not a tty" ]] || critical "You aint in a tty (are you in a 'lxc exec' ?) The script can't run because pbuilder won't be happy :|" } @@ -50,8 +50,8 @@ function checkout_tag() cd $GIT_REPOS/$PROJECT git fetch --quiet git fetch --tags --quiet - git checkout $DISTRIB-$BRANCH --quiet - git reset --hard origin/$DISTRIB-$BRANCH --quiet + git checkout dev --quiet + git reset --hard dev --quiet # Validate constrains for the version number given (is in changelog + has corresponding tag)