diff --git a/.travis.yml b/.travis.yml index 3c937245c7..7ff8931f06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,8 +47,6 @@ matrix: - env: TASK=coverage:payroll install: - travis_wait 60 npm install -before_script: - - npm prune script: - travis_wait 60 npm run $TASK after_success: diff --git a/apps/agent/.solcover.js b/apps/agent/.solcover.js index a4dd7966c6..e2fb2e94df 100644 --- a/apps/agent/.solcover.js +++ b/apps/agent/.solcover.js @@ -2,6 +2,8 @@ module.exports = { norpc: true, copyPackages: ['@aragon/os', '@aragon/apps-vault'], skipFiles: [ - 'test' + 'test', + '@aragon/os', + '@aragon/apps-vault/contracts/Vault.sol', ] } diff --git a/apps/agent/package.json b/apps/agent/package.json index e94483186c..0aa5e46b49 100644 --- a/apps/agent/package.json +++ b/apps/agent/package.json @@ -32,9 +32,10 @@ "description": "", "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", - "@aragon/cli": "^5.6.0", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.1.0", - "eth-gas-reporter": "^0.1.1", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ethereumjs-util": "^6.1.0", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", diff --git a/apps/finance/.solcover.js b/apps/finance/.solcover.js index eeeff05fb9..56419c111d 100644 --- a/apps/finance/.solcover.js +++ b/apps/finance/.solcover.js @@ -3,6 +3,8 @@ module.exports = { copyPackages: ['@aragon/os', '@aragon/apps-vault', '@aragon/test-helpers'], skipFiles: [ 'test', + '@aragon/os', + '@aragon/apps-vault/contracts/Vault.sol', '@aragon/test-helpers/contracts/TimeHelpersMock.sol', ] } diff --git a/apps/finance/package.json b/apps/finance/package.json index 636a82cdf6..482171dbcd 100644 --- a/apps/finance/package.json +++ b/apps/finance/package.json @@ -39,9 +39,10 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "^5.6.0", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.1.0", - "eth-gas-reporter": "^0.1.1", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", "solium": "^1.2.3", diff --git a/apps/survey/.solcover.js b/apps/survey/.solcover.js index 426fd02ea8..5f26723a07 100644 --- a/apps/survey/.solcover.js +++ b/apps/survey/.solcover.js @@ -3,6 +3,8 @@ module.exports = { copyPackages: ['@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers'], skipFiles: [ 'test', + '@aragon/os', + '@aragon/apps-shared-minime/contracts/MiniMeToken.sol', '@aragon/test-helpers/contracts/TimeHelpersMock.sol', ] } diff --git a/apps/survey/package.json b/apps/survey/package.json index d41a1521a6..9b29017b5e 100644 --- a/apps/survey/package.json +++ b/apps/survey/package.json @@ -33,9 +33,10 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "^5.6.0", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.1.0", - "eth-gas-reporter": "^0.1.1", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", "solium": "^1.2.3", diff --git a/apps/token-manager/.solcover.js b/apps/token-manager/.solcover.js index 426fd02ea8..5f26723a07 100644 --- a/apps/token-manager/.solcover.js +++ b/apps/token-manager/.solcover.js @@ -3,6 +3,8 @@ module.exports = { copyPackages: ['@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers'], skipFiles: [ 'test', + '@aragon/os', + '@aragon/apps-shared-minime/contracts/MiniMeToken.sol', '@aragon/test-helpers/contracts/TimeHelpersMock.sol', ] } diff --git a/apps/token-manager/package.json b/apps/token-manager/package.json index 0cb9905fe2..45cec7535e 100644 --- a/apps/token-manager/package.json +++ b/apps/token-manager/package.json @@ -39,9 +39,10 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "^5.6.0", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.1.0", - "eth-gas-reporter": "^0.1.1", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", "solium": "^1.2.3", diff --git a/apps/vault/.solcover.js b/apps/vault/.solcover.js index 99564f2a6e..b09c1c26f3 100644 --- a/apps/vault/.solcover.js +++ b/apps/vault/.solcover.js @@ -3,5 +3,6 @@ module.exports = { copyPackages: ['@aragon/os'], skipFiles: [ 'test', + '@aragon/os', ] } diff --git a/apps/vault/package.json b/apps/vault/package.json index 731b39522e..5f44e3ad3c 100644 --- a/apps/vault/package.json +++ b/apps/vault/package.json @@ -35,10 +35,11 @@ "description": "", "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", - "@aragon/cli": "^5.6.0", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.1.0", "eth-ens-namehash": "^2.0.8", - "eth-gas-reporter": "^0.1.1", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", "solium": "^1.2.3", diff --git a/apps/voting/.solcover.js b/apps/voting/.solcover.js index 426fd02ea8..5f26723a07 100644 --- a/apps/voting/.solcover.js +++ b/apps/voting/.solcover.js @@ -3,6 +3,8 @@ module.exports = { copyPackages: ['@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers'], skipFiles: [ 'test', + '@aragon/os', + '@aragon/apps-shared-minime/contracts/MiniMeToken.sol', '@aragon/test-helpers/contracts/TimeHelpersMock.sol', ] } diff --git a/apps/voting/package.json b/apps/voting/package.json index a7d3a8ba0a..d6cafa2348 100644 --- a/apps/voting/package.json +++ b/apps/voting/package.json @@ -40,9 +40,10 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/apps-shared-scripts": "^1.0.0", - "@aragon/cli": "^5.6.0", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.1.0", - "eth-gas-reporter": "^0.1.5", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", "solidity-sha3": "^0.4.1", diff --git a/future-apps/payroll/.solcover.js b/future-apps/payroll/.solcover.js index 31486db4e7..f8682eb166 100644 --- a/future-apps/payroll/.solcover.js +++ b/future-apps/payroll/.solcover.js @@ -2,7 +2,12 @@ module.exports = { norpc: true, copyPackages: ['@aragon/os', '@aragon/apps-finance', '@aragon/apps-vault', '@aragon/test-helpers'], skipFiles: [ + 'PayrollKit.sol', 'test', + '@aragon/os', + '@aragon/apps-vault/contracts/Finance.sol', + '@aragon/apps-vault/contracts/Vault.sol', + '@aragon/ppf-contracts', '@aragon/test-helpers/contracts/TimeHelpersMock.sol', ] } diff --git a/future-apps/payroll/package.json b/future-apps/payroll/package.json index fe62fcb0f1..34afa279be 100644 --- a/future-apps/payroll/package.json +++ b/future-apps/payroll/package.json @@ -53,9 +53,10 @@ "@aragon/apps-shared-scripts": "^1.0.0", "@aragon/apps-token-manager": "2.0.0", "@aragon/apps-vault": "4.0.0", - "@aragon/cli": "~5.6.2", + "@aragon/cli": "~5.6.0", "@aragon/test-helpers": "^1.2.0", - "eth-gas-reporter": "^0.1.12", + "eth-gas-reporter": "^0.2.0", + "ethereumjs-testrpc-sc": "^6.1.6", "ganache-cli": "^6.4.3", "solidity-coverage": "^0.5.11", "solium": "^1.2.3", diff --git a/package.json b/package.json index 292d0fb01e..aac9483474 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,12 @@ "license": "(GPL-3.0-or-later OR AGPL-3.0-or-later)", "devDependencies": { "coveralls": "^3.0.1", - "ganache-cli": "^6.1.0", "lcov-result-merger": "^3.1.0", - "lerna": "^3.11.1" + "lerna": "^3.14.1" }, "scripts": { "install": "node scripts/install", - "bootstrap": "lerna bootstrap --nohoist=@aragon/os", + "bootstrap": "lerna bootstrap --hoist --nohoist=@aragon/os --nohoist=@aragon/apps-shared-minime", "bootstrap:ci": "npm run bootstrap -- --no-ci", "clean": "git clean -fdxi apps future-apps shared", "test": "npm run test:all", diff --git a/scripts/install b/scripts/install index a2f87fb1fa..d12339a9ac 100755 --- a/scripts/install +++ b/scripts/install @@ -7,5 +7,5 @@ if (inCI) { execute('npm run bootstrap:ci', { stdio: 'inherit' }) } else { process.env.INSTALL_FRONTEND = true - execute('npm run bootstrap', { stdio: 'inherit' }) + execute('npm run bootstrap -- --nohoist=@aragon/cli', { stdio: 'inherit' }) } diff --git a/shared/minime/package.json b/shared/minime/package.json index c19264ec65..b3b4d993b9 100644 --- a/shared/minime/package.json +++ b/shared/minime/package.json @@ -22,8 +22,9 @@ "devDependencies": { "@aragon/apps-shared-migrations": "1.0.0", "@aragon/test-helpers": "^1.0.1", - "ganache-cli": "6.1.8", - "solidity-coverage": "0.5.8", + "ethereumjs-testrpc-sc": "^6.1.6", + "ganache-cli": "^6.4.3", + "solidity-coverage": "^0.5.11", "truffle": "4.1.14", "truffle-extract": "^1.2.1" }