Various fixes

This commit is contained in:
root 2018-04-28 20:10:51 +00:00
parent 801e653979
commit e92c239a8a
4 changed files with 5 additions and 4 deletions

View file

@ -56,13 +56,13 @@ function build_if_needed()
git checkout $BRANCH_NIGHTLY_GIT >/dev/null 2>/dev/null git checkout $BRANCH_NIGHTLY_GIT >/dev/null 2>/dev/null
if [ -z "$(git log ${BRANCH_NIGHTLY_GIT}..origin/${BRANCH_NIGHTLY_GIT})" ]; then if [ -z "$(git log ${BRANCH_NIGHTLY_GIT}..origin/${BRANCH_NIGHTLY_GIT})" ]; then
echo "Sources up-to-date, nothing to build." echo "Sources up-to-date, nothing to build."
return #return
fi fi
git pull origin $BRANCH_NIGHTLY_GIT >/dev/null git pull origin $BRANCH_NIGHTLY_GIT >/dev/null
VERSION=$(dpkg-parsechangelog -S Version 2>/dev/null) VERSION=$(dpkg-parsechangelog -S Version 2>/dev/null)
VERSION_NIGHTLY="${VERSION}~${TIMETAG}" VERSION_NIGHTLY="${VERSION}+${TIMETAG}"
# Tweak the changelog temporarily # Tweak the changelog temporarily
echo "> Setting version in changelog to ${VERSION_NIGHTLY}" echo "> Setting version in changelog to ${VERSION_NIGHTLY}"

View file

@ -25,6 +25,7 @@ git clone https://github.com/yunohost/ssowat SSOwat
git clone https://github.com/yunohost/moulinette git clone https://github.com/yunohost/moulinette
git clone https://github.com/yunohost/metronome git clone https://github.com/yunohost/metronome
git clone https://github.com/vstakhov/rspamd git clone https://github.com/vstakhov/rspamd
git clone https://git.donarmstrong.com/unscd.git
cd yunohost cd yunohost
git checkout stretch && git symbolic-ref refs/heads/stretch-unstable refs/heads/stretch git checkout stretch && git symbolic-ref refs/heads/stretch-unstable refs/heads/stretch

View file

@ -117,4 +117,4 @@ fi
echo "Build will start soon. See http://$REPO_URL" echo "Build will start soon. See http://$REPO_URL"
sendxmpppy "Launched build ${package}/${version} for ${CODENAME}/${COMPONENT}." sendxmpppy "Launched build ${package}/${version} for ${CODENAME}/${DISTRIBUTION} ..."

View file

@ -20,7 +20,7 @@ function build_metronome()
{ {
local PACKAGE="metronome" local PACKAGE="metronome"
# For some reason metronome version must include a revision ("-x") # For some reason metronome version must include a revision ("-x")
local VERSION="3.7.10${YUNOHOST_PREFIX}${YUNOHOST_REVISION}" local VERSION="3.8.13${YUNOHOST_PREFIX}${YUNOHOST_REVISION}"
build $PACKAGE $VERSION build $PACKAGE $VERSION
} }