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 /scripts | |
| parent | 6e4e627b133cd86df204c7d769a15347e32c3e46 (diff) | |
| parent | 194ff033ae44944ac59aa7bd3da89ba94ec5893c (diff) | |
| download | dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.gz dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.bz2 dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.lz dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.xz dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.tar.zst dexon-solidity-331b0b1c6ba79011025292d6247cf629fff40c6e.zip | |
Merge pull request #2516 from ethereum/release
Merge release back into develop.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bytecodecompare/storebytecode.sh | 3 | ||||
| -rwxr-xr-x | scripts/create_source_tarball.sh | 4 |
2 files changed, 5 insertions, 2 deletions
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 |