cerc-io/solidity
16
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

Merge pull request #2516 from ethereum/release

Browse Source 
Merge release back into develop.
This commit is contained in:
chriseth 2017-07-04 12:18:49 +02:00 committed by GitHub
commit 331b0b1c6b
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -180,7 +180,7 @@ cache:
install: install:
- test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh) - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh)
- test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.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 - echo -n "$TRAVIS_COMMIT" > commit_hash.txt
before_script: before_script:

2
appveyor.yml
View File

@ -54,7 +54,7 @@ install:
- git submodule update --init --recursive - git submodule update --init --recursive
- ps: $prerelease = "nightly." - ps: $prerelease = "nightly."
- ps: $prerelease += Get-Date -format "yyyy.M.d" - 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 - scripts/install_deps.bat
- set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps\install - set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps\install
before_build: before_build:

3
scripts/bytecodecompare/storebytecode.sh
View File

@ -98,9 +98,8 @@ EOF
REPORT="$DIRNAME/$ZIP_SUFFIX.txt" REPORT="$DIRNAME/$ZIP_SUFFIX.txt"
cp ../report.txt "$REPORT" cp ../report.txt "$REPORT"
# Only push if adding actually worked, i.e. there were changes. # 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 then
git commit -a -m "Added report $REPORT"
git pull --rebase git pull --rebase
git push origin git push origin
else else

4
scripts/create_source_tarball.sh
View File

@ -26,6 +26,10 @@ REPO_ROOT="$(dirname "$0")"/..
git submodule foreach 'git checkout-index -a --prefix="'"$SOLDIR"'/$path/"' git submodule foreach 'git checkout-index -a --prefix="'"$SOLDIR"'/$path/"'
# Store the commit hash # Store the commit hash
echo "$commithash" > "$SOLDIR/commit_hash.txt" echo "$commithash" > "$SOLDIR/commit_hash.txt"
if [ -e prerelease.txt -a ! -s prerelease.txt ]
then
cp prerelease.txt "$SOLDIR/"
fi
# Add dependencies # Add dependencies
mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true 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 wget -O "$SOLDIR/deps/downloads/jsoncpp-1.7.7.tar.gz" https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz