Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI #309

Merged
merged 2 commits into from
May 16, 2018
Merged

Fix CI #309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
547fe5f
Fix CI
May 14, 2018
3bb6eeb
Voting, Token-Manager: Update solidity-coverage to 0.4.3
May 15, 2018
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
2 changes: 1 addition & 1 deletion apps/token-manager/contracts/TokenManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import "@aragon/os/contracts/lib/zeppelin/math/SafeMath.sol";
import "@aragon/os/contracts/lib/misc/Migrations.sol";


contract TokenManager is ITokenController, AragonApp { // ,IForwarder makes coverage crash (removes pure and interface doesnt match)
contract TokenManager is ITokenController, AragonApp, IForwarder {
using SafeMath for uint256;

MiniMeToken public token;
Expand Down
22 changes: 11 additions & 11 deletions apps/token-manager/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/token-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"babel-register": "^6.26.0",
"eth-gas-reporter": "^0.1.1",
"ganache-cli": "^6.1.0",
"solidity-coverage": "0.3.5",
"solidity-coverage": "0.4.3",
"solium": "^1.0.4",
"truffle": "4.0.5",
"truffle-hdwallet-provider": "0.0.3",
Expand Down
22 changes: 11 additions & 11 deletions apps/voting/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/voting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"babel-register": "^6.26.0",
"eth-gas-reporter": "^0.1.1",
"ganache-cli": "^6.1.0",
"solidity-coverage": "0.3.5",
"solidity-coverage": "0.4.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow, does this just work now? I remember having to do some funny things in order for this upgrade to work properly (sc-forks/solidity-coverage#182).

We also might as well specify 0.4.15 as the version: https://github.com/sc-forks/solidity-coverage/blob/master/CHANGELOG.md#0415--2018-03-28

"solidity-sha3": "^0.4.1",
"solium": "^1.0.4",
"truffle": "4.0.5",
Expand Down
Loading