Skip to content

Commit

Permalink
Merge branch 'master' into state-hooks
Browse files Browse the repository at this point in the history
* master:
  Change the default to threading (#1779)
  Coveralls Take 2 (#1784)
  • Loading branch information
ekilmer committed Aug 5, 2020
2 parents d7098bf + 2347b21 commit 24a7877
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 22 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,30 @@ jobs:
# Install solc unconditionally because it only takes a second or two
sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.4.24/solc-static-linux
sudo chmod +x /usr/bin/solc
pip install coveralls
pip install -e ".[dev-noks]"
- name: Run Tests
env:
TEST_TYPE: ${{ matrix.type }}
run: |
cp scripts/run_tests.sh .
./run_tests.sh
- name: Coverage Upload
uses: codecov/codecov-action@v1
- name: Coveralls Parallel
run: |
coveralls
env:
COVERALLS_PARALLEL: true
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
# Send notification when all tests have finished to combine coverage results
coverage-finish:
needs: tests
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v1.1.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
yml: ./codecov.yml
# Disabled this line because Codecov has been extra flaky lately, and having to re-run the entire
# test suite until every coverage upload step succeeds is more of a hassle than it's worth.
# fail_ci_if_error: true
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
upload:
runs-on: ubuntu-latest
if: github.event_name == 'schedule'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


[![Build Status](https://img.shields.io/github/workflow/status/trailofbits/manticore/CI/master)](https://github.com/trailofbits/manticore/actions?query=workflow%3ACI)
[![Codecov](https://img.shields.io/codecov/c/github/trailofbits/manticore)](https://codecov.io/github/trailofbits/manticore)
[![Coverage Status](https://coveralls.io/repos/github/trailofbits/manticore/badge.svg)](https://coveralls.io/github/trailofbits/manticore)
[![PyPI Version](https://badge.fury.io/py/manticore.svg)](https://badge.fury.io/py/manticore)
[![Slack Status](https://empireslacking.herokuapp.com/badge.svg)](https://empireslacking.herokuapp.com)
[![Documentation Status](https://readthedocs.org/projects/manticore/badge/?version=latest)](http://manticore.readthedocs.io/en/latest/?badge=latest)
Expand Down
12 changes: 0 additions & 12 deletions codecov.yml

This file was deleted.

2 changes: 1 addition & 1 deletion manticore/core/manticore.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def to_class(self):
)
consts.add("procs", default=10, description="Number of parallel processes to spawn")

proc_type = MProcessingType.multiprocessing
proc_type = MProcessingType.threading
if sys.platform != "linux":
logger.warning("Manticore is only supported on Linux. Proceed at your own risk!")
proc_type = MProcessingType.threading
Expand Down

0 comments on commit 24a7877

Please sign in to comment.