From 3bcbae2ca77a62cade1c0e00dccc814c4f27b8fc Mon Sep 17 00:00:00 2001 From: Tykayn Date: Thu, 19 Aug 2021 14:38:35 +0200 Subject: [PATCH] exclude rc versions from upgrade check --- monitoring/check_mobilizonchaprilorg_update | 2 +- upgrade/upgrade.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monitoring/check_mobilizonchaprilorg_update b/monitoring/check_mobilizonchaprilorg_update index 67d6847..9e5e479 100755 --- a/monitoring/check_mobilizonchaprilorg_update +++ b/monitoring/check_mobilizonchaprilorg_update @@ -23,7 +23,7 @@ function usage() { if [ "$#" -ne 0 ]; then usage else - lastVersion=$(curl -s https://framagit.org/api/v4/projects/$FRAMAGIT_PROJECT_ID/releases | jshon -a -e name|cut -d '"' -f2|grep -v '[\^\(alpha\)]'|head -n 1) + lastVersion=$(curl -s https://framagit.org/api/v4/projects/$FRAMAGIT_PROJECT_ID/releases | jshon -a -e name > /tmp/listOfVersions.txt && sed -i -e "/rc/d" /tmp/listOfVersions.txt && cat /tmp/listOfVersions.txt |cut -d '"' -f2|grep -v '[\^\(alpha\)]'|head -n 1) currentVersion=$(cd $LOCAL_REPO && git describe --exact-match --tags $(git log -n1 --pretty='%h') |cut -c 9-100 ) # le tag se nomme ainsi "chapril-1.0.2" donc pour comparer uniquement les numéros de version on enlève le début du nom diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh index ca69784..ef59638 100644 --- a/upgrade/upgrade.sh +++ b/upgrade/upgrade.sh @@ -12,7 +12,7 @@ echo " " cd LOCAL_REPO git fetch --tags -lastVersion=$(curl -s https://framagit.org/api/v4/projects/$FRAMAGIT_PROJECT_ID/releases | jshon -a -e name|cut -d '"' -f2|grep -v '[\^\(alpha\)]'|head -n 1) +lastVersion=$(curl -s https://framagit.org/api/v4/projects/$FRAMAGIT_PROJECT_ID/releases | jshon -a -e name > /tmp/listOfVersions.txt && sed -i -e "/rc/d" /tmp/listOfVersions.txt && cat /tmp/listOfVersions.txt |cut -d '"' -f2|grep -v '[\^\(alpha\)]'|head -n 1) currentVersion=$(cd $LOCAL_REPO && git branch | grep '*'|cut -c 3-100 ) if [ $currentVersion = $lastVersion ]; then echo " "