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

Parallel builds for emscripten and docs.

Browse Source
This commit is contained in:
chriseth 2016-08-02 00:31:08 +02:00
parent f44320269e
commit 8a801879d1
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.travis.yml
View File

@ -34,6 +34,17 @@ branches:
- /develop-v[0-9]/ - /develop-v[0-9]/
matrix: matrix:
include: include:
- os: linux
dist: trusty
compiler: gcc
env:
- TRAVIS_BUILD_TYPE=RelWithDebInfo
- ZIP_SUFFIX=ubuntu-trusty
- os: linux
dist: trusty
compiler: gcc
env:
- JOB=docs
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
@ -43,8 +54,7 @@ matrix:
before_install: before_install:
- docker pull trzeci/emscripten:sdk-tag-1.35.4-64bit - docker pull trzeci/emscripten:sdk-tag-1.35.4-64bit
env: env:
- TRAVIS_BUILD_TYPE=RelWithDebInfo - JOB=emscripten
- ZIP_SUFFIX=ubuntu-trusty
- os: osx - os: osx
osx_image: beta-xcode6.2 osx_image: beta-xcode6.2
env: env:
@ -71,19 +81,18 @@ cache:
- cryptopp - cryptopp
- boost_1_57_0 - boost_1_57_0
- build - build
- build-emscripten
- jsoncpp - jsoncpp
install: install:
- ./scripts/install_deps.sh - ./scripts/install_deps.sh
before_script: before_script:
- ./scripts/build_emscripten.sh - test $JOB != emscripten || ./scripts/build_emscripten.sh
- mkdir -p build - test $JOB != default || (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:
# 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
@ -95,10 +104,12 @@ 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
- cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) - test $JOB != default || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) )
- test $JOB != docs || ./scripts/docs.sh
env: env:
global: global:
- ENCRYPTION_LABEL="296c219a3f41" - ENCRYPTION_LABEL="296c219a3f41"
- JOB=default
# This is the deploy target for the Emscripten build. # This is the deploy target for the Emscripten build.
# It publishes the JS file which was compiled as part of the earlier 'build_emscripten.sh' # It publishes the JS file which was compiled as part of the earlier 'build_emscripten.sh'
@ -109,7 +120,7 @@ env:
deploy: deploy:
provider: script provider: script
script: scripts/release_emscripten.sh script: test $JOB != emscripten || scripts/release_emscripten.sh
skip_cleanup: true skip_cleanup: true
on: on:
branch: develop branch: develop

6
scripts/travis-emscripten/build_emscripten.sh
View File

@ -85,8 +85,8 @@ echo -en 'travis_fold:end:compiling_boost\\r'
# Build dependent components and solidity itself # Build dependent components and solidity itself
echo -en 'travis_fold:start:compiling_solidity\\r' echo -en 'travis_fold:start:compiling_solidity\\r'
cd $WORKSPACE cd $WORKSPACE
mkdir -p build-emscripten mkdir -p build
cd build-emscripten cd build
emcmake cmake \ emcmake cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DEMSCRIPTEN=1 \ -DEMSCRIPTEN=1 \
@ -125,6 +125,6 @@ emcmake cmake \
emmake make -j 4 emmake make -j 4
cd .. cd ..
cp build-emscripten/solc/soljson.js ./ cp build/solc/soljson.js ./
echo -en 'travis_fold:end:compiling_solidity\\r' echo -en 'travis_fold:end:compiling_solidity\\r'