Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,11 @@ jobs:
- persist_to_workspace: *artifacts_executables

b_ubu: &build_ubuntu2004
resource_class: xlarge
docker:
- image: ethereum/solidity-buildpack-deps:ubuntu2004-<< pipeline.parameters.ubuntu-2004-docker-image-rev >>
environment:
MAKEFLAGS: -j 10
steps:
- checkout
- run: *run_build
Expand Down Expand Up @@ -583,9 +586,11 @@ jobs:
- store_artifacts: *artifacts_test_results

b_ems:
resource_class: xlarge
docker:
- image: ethereum/solidity-buildpack-deps:emsdk-1.39.15-2
environment:
MAKEFLAGS: -j 10
TERM: xterm
steps:
- checkout
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ env:
- SOLC_TESTS=On
- SOLC_STOREBYTECODE=Off
- SOLC_DOCKER=Off
- MAKEFLAGS="-j 4"

matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ cd build
# shellcheck disable=SC2086
cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" $CMAKE_OPTIONS -G "Unix Makefiles"

make -j 4
make
2 changes: 1 addition & 1 deletion scripts/travis-emscripten/build_emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cmake \
-DBoost_USE_STATIC_RUNTIME=1 \
-DTESTS=0 \
..
make -j 4 soljson
make soljson
# Patch soljson.js for backwards compatibility.
# TODO: remove this with 0.7.
# "viiiii" encodes the signature of the callback function.
Expand Down