diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-05-20 04:30:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-20 04:30:58 +0800 |
| commit | 1344f28fdc96276285a009df369e02555141fc27 (patch) | |
| tree | 44b00e43c8408d105cee2d1dba5a6968b20226d3 | |
| parent | d236d6c96222fd56bcf903e5bd803f7b1b23697f (diff) | |
| parent | 1ce9b91275fedb3a69e68336ba5fb0819dce9ce2 (diff) | |
| download | dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.tar dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.tar.gz dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.tar.bz2 dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.tar.lz dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.tar.xz dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.tar.zst dexon-solidity-1344f28fdc96276285a009df369e02555141fc27.zip | |
Merge pull request #2283 from ethereum/doNotErrOnFailedUpload
Make bytecode upload more robust and use date for directory name.
| -rwxr-xr-x | scripts/bytecodecompare/storebytecode.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh index 9a40bc6d..b3491cfa 100755 --- a/scripts/bytecodecompare/storebytecode.sh +++ b/scripts/bytecodecompare/storebytecode.sh @@ -87,18 +87,27 @@ EOF eval `ssh-agent -s` ssh-add deploy_key + COMMIT_DATE=$(cd "$REPO_ROOT" && git show -s --format="%cd" --date=short "$TRAVIS_COMMIT") + git clone --depth 2 git@github.com:ethereum/solidity-test-bytecode.git cd solidity-test-bytecode git config user.name "travis" git config user.email "chris@ethereum.org" git clean -f -d -x - mkdir -p "$TRAVIS_COMMIT" - REPORT="$TRAVIS_COMMIT/$ZIP_SUFFIX.txt" + DIRECTORY=$COMMIT_DATE"_"$TRAVIS_COMMIT + mkdir -p "$DIRECTORY" + REPORT="$DIRECTORY/$ZIP_SUFFIX.txt" cp ../report.txt "$REPORT" - git add "$REPORT" - git commit -a -m "Added report $REPORT" - git push origin + # Only push if adding actually worked, i.e. there were changes. + if git add "$REPORT" + then + git commit -a -m "Added report $REPORT" + git pull --rebase + git push origin + else + echo "Adding report failed, it might already exist in the repository." + fi fi ) rm -rf "$TMPDIR"
\ No newline at end of file |