From 4588eda622c9ef2cb62252ec12ea7bb9ae057bd1 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 23 Aug 2016 16:45:08 +0200 Subject: Store commit hash and handle prerelease vor all automation tools. --- scripts/build_emscripten.sh | 1 + scripts/release_ppa.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh index 6046978e..da2c7df3 100755 --- a/scripts/build_emscripten.sh +++ b/scripts/build_emscripten.sh @@ -29,6 +29,7 @@ set -e if [[ "$OSTYPE" != "darwin"* ]]; then + date -u +"nightly.%Y.%m.%d" > prerelease.txt ./scripts/travis-emscripten/install_deps.sh docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh fi diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh index 2fd286fd..8e9dc282 100755 --- a/scripts/release_ppa.sh +++ b/scripts/release_ppa.sh @@ -56,13 +56,13 @@ commithash=`git rev-parse --short HEAD` committimestamp=`git show --format=%ci HEAD | head -n 1` commitdate=`git show --format=%ci HEAD | head -n 1 | cut - -b1-10` -# TODO store the commit hash in a file so that the build info mechanism can pick it up even without git - +echo "$commithash" > commit_hash.txt if [ $branch = develop ] then debversion="$version-nightly-$commitdate-$commithash" else debversion="$version" + echo -n > prerelease.txt # proper release fi # gzip will create different tars all the time and we are not allowed -- cgit