diff options
| author | chriseth <chris@ethereum.org> | 2017-07-04 18:18:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 18:18:49 +0800 |
| commit | 331b0b1c6ba79011025292d6247cf629fff40c6e (patch) | |
| tree | 1fae4df923f7ceecb9001d843f933c96ff191d32 | |
| parent | 6e4e627b133cd86df204c7d769a15347e32c3e46 (diff) | |
| parent | 194ff033ae44944ac59aa7bd3da89ba94ec5893c (diff) | |
| download | dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.gz dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.zst dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.zip | |
Merge pull request #2516 from ethereum/release
Merge release back into develop.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rwxr-xr-x | scripts/bytecodecompare/storebytecode.sh | 3 | ||||
| -rwxr-xr-x | scripts/create_source_tarball.sh | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e82da7c0..34b1152c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,7 +180,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 + - if [ "$TRAVIS_BRANCH" = release -o -n "$TRAVIS_TAG" ]; 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/appveyor.yml b/appveyor.yml index 55c80a21..3d4d65bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,7 +54,7 @@ install: - git submodule update --init --recursive - ps: $prerelease = "nightly." - ps: $prerelease += Get-Date -format "yyyy.M.d" - - ps: Set-Content prerelease.txt $prerelease + - ps: if($env:appveyor_repo_branch -eq 'release') { Set-Content prerelease.txt $null } else { Set-Content prerelease.txt $prerelease } - scripts/install_deps.bat - set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps\install before_build: diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh index 564de3f8..8d4100bf 100755 --- a/scripts/bytecodecompare/storebytecode.sh +++ b/scripts/bytecodecompare/storebytecode.sh @@ -98,9 +98,8 @@ EOF REPORT="$DIRNAME/$ZIP_SUFFIX.txt" cp ../report.txt "$REPORT" # Only push if adding actually worked, i.e. there were changes. - if git add "$REPORT" + if git add "$REPORT" && git commit -a -m "Added report $REPORT" then - git commit -a -m "Added report $REPORT" git pull --rebase git push origin else diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh index 7339e106..9e66799a 100755 --- a/scripts/create_source_tarball.sh +++ b/scripts/create_source_tarball.sh @@ -26,6 +26,10 @@ REPO_ROOT="$(dirname "$0")"/.. git submodule foreach 'git checkout-index -a --prefix="'"$SOLDIR"'/$path/"' # Store the commit hash echo "$commithash" > "$SOLDIR/commit_hash.txt" + if [ -e prerelease.txt -a ! -s prerelease.txt ] + then + cp prerelease.txt "$SOLDIR/" + fi # Add dependencies mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true wget -O "$SOLDIR/deps/downloads/jsoncpp-1.7.7.tar.gz" https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz |