diff options
| author | chriseth <chris@ethereum.org> | 2017-03-23 03:18:20 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-03-23 16:56:17 +0800 |
| commit | b28aefe28c183b307b162cea1536f3027a780952 (patch) | |
| tree | 5bc42b877aa7429210081daf53c0f80727662bce | |
| parent | 74d7c513895d28c9746f09d802069809030f2b97 (diff) | |
| download | dexon-solidity-b28aefe28c183b307b162cea1536f3027a780952.tar.gz dexon-solidity-b28aefe28c183b307b162cea1536f3027a780952.tar.zst dexon-solidity-b28aefe28c183b307b162cea1536f3027a780952.zip | |
Use "nightly" version string for all CI built binaries.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/build_emscripten.sh | 6 | ||||
| -rwxr-xr-x | scripts/create_source_tarball.sh | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 61fe0cc3..35c9e840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,6 +113,7 @@ matrix: - SOLC_INSTALL_DEPS_TRAVIS=Off - SOLC_RELEASE=Off - SOLC_TESTS=Off + - ZIP_SUFFIX=emscripten # OS X Mavericks (10.9) # https://en.wikipedia.org/wiki/OS_X_Mavericks @@ -175,6 +176,7 @@ cache: install: - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh) - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh) + - if [ "$TRAVIS_BRANCH" = release ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi - echo -n "$TRAVIS_COMMIT" > commit_hash.txt before_script: diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh index 9b432e95..6046978e 100755 --- a/scripts/build_emscripten.sh +++ b/scripts/build_emscripten.sh @@ -29,12 +29,6 @@ set -e if [[ "$OSTYPE" != "darwin"* ]]; then - if [ "$TRAVIS_BRANCH" = release ] - then - echo -n > prerelease.txt - else - date -u +"nightly.%Y.%-m.%-d" > prerelease.txt - fi ./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/create_source_tarball.sh b/scripts/create_source_tarball.sh index bf8a336b..9ca72c31 100755 --- a/scripts/create_source_tarball.sh +++ b/scripts/create_source_tarball.sh @@ -15,7 +15,7 @@ REPO_ROOT="$(dirname "$0")"/.. then versionstring="$version" else - versionstring="$version-develop-$commitdate-$commithash" + versionstring="$version-nightly-$commitdate-$commithash" fi TEMPDIR=$(mktemp -d) |