diff --git a/daily-build b/daily-build index 27cb7ed..ae2c5a3 100755 --- a/daily-build +++ b/daily-build @@ -56,13 +56,13 @@ function build_if_needed() git checkout $BRANCH_NIGHTLY_GIT >/dev/null 2>/dev/null if [ -z "$(git log ${BRANCH_NIGHTLY_GIT}..origin/${BRANCH_NIGHTLY_GIT})" ]; then echo "Sources up-to-date, nothing to build." - return + #return fi git pull origin $BRANCH_NIGHTLY_GIT >/dev/null VERSION=$(dpkg-parsechangelog -S Version 2>/dev/null) - VERSION_NIGHTLY="${VERSION}~${TIMETAG}" + VERSION_NIGHTLY="${VERSION}+${TIMETAG}" # Tweak the changelog temporarily echo "> Setting version in changelog to ${VERSION_NIGHTLY}" diff --git a/init.sh b/init.sh index afdab89..501de0a 100755 --- a/init.sh +++ b/init.sh @@ -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/metronome git clone https://github.com/vstakhov/rspamd +git clone https://git.donarmstrong.com/unscd.git cd yunohost git checkout stretch && git symbolic-ref refs/heads/stretch-unstable refs/heads/stretch diff --git a/scripts/build_deb b/scripts/build_deb index 7968da0..0d78d87 100755 --- a/scripts/build_deb +++ b/scripts/build_deb @@ -117,4 +117,4 @@ fi 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} ..." diff --git a/scripts/ynh-custom-builds b/scripts/ynh-custom-builds index 84f2513..906017e 100755 --- a/scripts/ynh-custom-builds +++ b/scripts/ynh-custom-builds @@ -20,7 +20,7 @@ function build_metronome() { local PACKAGE="metronome" # 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 }