From d81d9e8868f0ca78e49bb3b34bb1845c75f1df8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Joda=20St=C3=B6=C3=9Fer?= Date: Sun, 13 Dec 2015 04:14:54 +0100 Subject: [PATCH] build.sh: release name Vorschlag Algorithmus gefixed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit basierend auf dem gewählten branch, wird jetzt die letzte Version dessen ausgeworfen, statt immer der von testing die if conditions zum Ermitteln, ob eine neue gluon Version eingesetzt wird, laufen jetzt richtig durch und geben den richtigen release name Vorschlag aus, nicht immer nur der für testing --- build.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index dbade16..a7530a1 100755 --- a/build.sh +++ b/build.sh @@ -94,13 +94,17 @@ if ! $cont; then echo "Building Gluon ${GLUON_TAG} as ${GLUON_BRANCH}" last_release_testing="$(get_last_release testing)" last_release_stable="$(get_last_release stable)" - echo "Last release in branch testing was ${last_release_testing}" - if is_based_on "$last_release_testing" "$GLUON_TAG"; then + if [ "${GLUON_BRANCH}" = "testing" ]; then + echo "Last release in branch testing was ${last_release_testing}" + elif [ "${GLUON_BRANCH}" = "stable" ]; then + echo "Last release in branch stable was ${last_release_stable}" + fi + if [ "$GLUON_BRANCH" = "testing" ] && is_based_on "$last_release_testing" "$GLUON_TAG"; then + # same gluon version for new testing=> local version number +1 local_version="$(extract_local_version "$last_release_testing")" - if [ "$GLUON_BRANCH" != "stable" ]; then - local_version="$(($local_version + 1))" - fi + local_version="$(($local_version + 1))" elif [ "$GLUON_BRANCH" = "stable" ] && is_based_on "$last_release_stable" "$GLUON_TAG"; then + # same gluon version for new stable => local version number +1 local_version="$(extract_local_version "$last_release_stable")" local_version="$(($local_version + 1))" else