cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store commit hash and handle prerelease vor all automation tools.

Browse Source
This commit is contained in:
chriseth 2016-08-23 16:45:08 +02:00
parent 54ab787b83
commit 4588eda622
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -141,6 +141,8 @@ cache:
install: install:
- test $TRAVIS_INSTALL_DEPS != On || ./scripts/install_deps.sh - 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: before_script:
- test $TRAVIS_EMSCRIPTEN != On || ./scripts/build_emscripten.sh - test $TRAVIS_EMSCRIPTEN != On || ./scripts/build_emscripten.sh
- test $TRAVIS_RELEASE != On || (mkdir -p build - test $TRAVIS_RELEASE != On || (mkdir -p build

1
cmake/scripts/buildinfo.cmake
View File

@ -23,6 +23,7 @@ endif()
# If it does not exist, create our own prerelease string # If it does not exist, create our own prerelease string
if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt) if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt)
file(READ ${ETH_SOURCE_DIR}/prerelease.txt SOL_VERSION_PRERELEASE) file(READ ${ETH_SOURCE_DIR}/prerelease.txt SOL_VERSION_PRERELEASE)
string(STRIP ${SOL_VERSION_PRERELEASE} SOL_VERSION_PRERELEASE)
else() else()
string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC) string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC)
endif() endif()

1
scripts/build_emscripten.sh
View File

@ -29,6 +29,7 @@
set -e set -e
if [[ "$OSTYPE" != "darwin"* ]]; then if [[ "$OSTYPE" != "darwin"* ]]; then
date -u +"nightly.%Y.%m.%d" > prerelease.txt
./scripts/travis-emscripten/install_deps.sh ./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 docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
fi fi

4
scripts/release_ppa.sh
View File

@ -56,13 +56,13 @@ commithash=`git rev-parse --short HEAD`
committimestamp=`git show --format=%ci HEAD | head -n 1` committimestamp=`git show --format=%ci HEAD | head -n 1`
commitdate=`git show --format=%ci HEAD | head -n 1 | cut - -b1-10` 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 ] if [ $branch = develop ]
then then
debversion="$version-nightly-$commitdate-$commithash" debversion="$version-nightly-$commitdate-$commithash"
else else
debversion="$version" debversion="$version"
echo -n > prerelease.txt # proper release
fi fi
# gzip will create different tars all the time and we are not allowed # gzip will create different tars all the time and we are not allowed