Skip to content

Commit

Permalink
Store commit hash and handle prerelease vor all automation tools.
Browse files Browse the repository at this point in the history
  • Loading branch information
chriseth committed Aug 26, 2016
1 parent 54ab787 commit 4588eda
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ cache:

install:
- test $TRAVIS_INSTALL_DEPS != On || ./scripts/install_deps.sh
- echo -n "$TRAVIS_COMMIT" > commit_hash.txt
- test "$TRAVIS_PULL_REQUESTS" != "false" || test "$TRAVIS_BRANCH" != release || echo -n > prerelease.txt # this is a proper release
before_script:
- test $TRAVIS_EMSCRIPTEN != On || ./scripts/build_emscripten.sh
- test $TRAVIS_RELEASE != On || (mkdir -p build
Expand Down
1 change: 1 addition & 0 deletions cmake/scripts/buildinfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ endif()
# If it does not exist, create our own prerelease string
if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt)
file(READ ${ETH_SOURCE_DIR}/prerelease.txt SOL_VERSION_PRERELEASE)
string(STRIP ${SOL_VERSION_PRERELEASE} SOL_VERSION_PRERELEASE)
else()
string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC)
endif()
Expand Down
1 change: 1 addition & 0 deletions scripts/build_emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions scripts/release_ppa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4588eda

Please sign in to comment.