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 #896 from bobsummerwill/parameter_for_tests

Browse Source 
Fixed conditionals for TravisCI
This commit is contained in:
Bob Summerwill 2016-08-15 01:12:23 -07:00 committed by GitHub
commit 868a1675a3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@ -54,7 +54,6 @@ matrix:
compiler: gcc compiler: gcc
env: env:
- TRAVIS_DOCS=On - TRAVIS_DOCS=On
- TRAVIS_INSTALL_DEPS=Off
- TRAVIS_RELEASE=Off - TRAVIS_RELEASE=Off
- TRAVIS_TESTS=Off - TRAVIS_TESTS=Off
@ -133,17 +132,17 @@ cache:
- jsoncpp - jsoncpp
install: install:
- test $TRAVIS_INSTALL_DEPS==Off || ./scripts/install_deps.sh - test $TRAVIS_INSTALL_DEPS != On || ./scripts/install_deps.sh
before_script: before_script:
- test $TRAVIS_EMSCRIPTEN==Off || ./scripts/build_emscripten.sh - test $TRAVIS_EMSCRIPTEN != On || ./scripts/build_emscripten.sh
- test $TRAVIS_RELEASE==Off || (mkdir -p build - test $TRAVIS_RELEASE != On || (mkdir -p build
&& cd build && cd build
&& cmake .. -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE && cmake .. -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE
&& make -j2 && make -j2
&& cd .. && cd ..
&& ./scripts/release.sh $ZIP_SUFFIX ) && ./scripts/release.sh $ZIP_SUFFIX )
script: script:
- test $TRAVIS_DOCS==Off || ./scripts/docs.sh - test $TRAVIS_DOCS != On || ./scripts/docs.sh
# There are a variety of reliability issues with the Solidity unit-tests at the time of # There are a variety of reliability issues with the Solidity unit-tests at the time of
# writing (especially on macOS), so within TravisCI we will try to run the unit-tests # writing (especially on macOS), so within TravisCI we will try to run the unit-tests
@ -155,7 +154,7 @@ script:
# itself is broken from the failure messages which we are seeing. # itself is broken from the failure messages which we are seeing.
# #
# More details on known issues at https://github.com/ethereum/solidity/issues/769 # More details on known issues at https://github.com/ethereum/solidity/issues/769
- test $TRAVIS_TESTS==Off || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) ) - test $TRAVIS_TESTS != On || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) )
env: env:
global: global:
- ENCRYPTION_LABEL="6d4541b72666" - ENCRYPTION_LABEL="6d4541b72666"
@ -219,4 +218,4 @@ deploy:
on: on:
repo: ethereum/solidity repo: ethereum/solidity
branch: release branch: release
condition: $TRAVIS_RELEASE==On condition: $TRAVIS_RELEASE == On