diff options
| author | chriseth <chris@ethereum.org> | 2017-10-23 16:57:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 16:57:23 +0800 |
| commit | 31318305f3da0296cd31fedfe0512037a4b901c2 (patch) | |
| tree | fc4cadbbfc2c80d8298a6c8034bb8a35f4a24608 | |
| parent | dc6b1f02bc8b578caa3b3c42e11d9f19a9f4cd6d (diff) | |
| parent | ca236d4225643d33e747099276a2aaf2bb08d329 (diff) | |
| download | dexon-solidity-31318305f3da0296cd31fedfe0512037a4b901c2.tar.gz dexon-solidity-31318305f3da0296cd31fedfe0512037a4b901c2.tar.zst dexon-solidity-31318305f3da0296cd31fedfe0512037a4b901c2.zip | |
Merge pull request #3113 from limexp/fix/2300-skip-bytecodecompare
No bytecodecompare if tests failed (issue #2300)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 708d3620..a2301c42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -184,8 +184,10 @@ before_script: script: - test $SOLC_EMSCRIPTEN != On || (scripts/test_emscripten.sh) + - test $? == 0 || SOLC_STOREBYTECODE=Off - test $SOLC_DOCS != On || (scripts/docs.sh) - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh) + - test $? == 0 || SOLC_STOREBYTECODE=Off - test $SOLC_STOREBYTECODE != On || (cd $TRAVIS_BUILD_DIR && scripts/bytecodecompare/storebytecode.sh) deploy: diff --git a/appveyor.yml b/appveyor.yml index c63414b3..c4584228 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,15 +68,14 @@ build_script: - cd %APPVEYOR_BUILD_FOLDER% - scripts\release.bat %CONFIGURATION% - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short -# Skip bytecode compare if private key is not available - - ps: if ($env:priv_key) { - scripts\bytecodecompare\storebytecode.bat $Env:CONFIGURATION $bytecodedir - } test_script: - - cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION% - soltest.exe --show-progress -- --no-ipc --no-smt +# Skip bytecode compare if private key is not available + - ps: if ($env:priv_key) { + scripts\bytecodecompare\storebytecode.bat $Env:CONFIGURATION $bytecodedir + } artifacts: - path: solidity-windows.zip |