From 6cb3ec87fe3ef8d2407fe03e83b0dbbfccbb3d4e Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Sat, 16 May 2020 15:51:57 -0700 Subject: [PATCH 01/11] use codecov github action --- .circleci/config.yml | 64 -------------------------- .github/workflows/account-build.yml | 5 +- .github/workflows/block-build.yml | 9 ++-- .github/workflows/blockchain-build.yml | 5 +- .github/workflows/common-build.yml | 5 +- .github/workflows/tx-bulid.yml | 11 ++--- .github/workflows/vm-build.yml | 21 ++++----- .github/workflows/vm-nightly-test.yml | 20 ++------ packages/account/package.json | 3 +- packages/block/package.json | 3 +- packages/blockchain/package.json | 3 -- packages/common/package.json | 7 +-- packages/tx/package.json | 5 +- 13 files changed, 36 insertions(+), 125 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 003ee51095e..00000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,64 +0,0 @@ -# -# This whole file is a workaround, as Codecov does not fully support GitHub Actions for pull requests from external repositories. Codecov + CircleCI does. -# As soon as a release is made, we can migrate to GitHub Actions, taking advantage of their job filtering. -# - -version: 2.1 - -aliases: - - &steps - docker: - - image: circleci/node:10 - steps: - - checkout - - run: - name: Installing dependencies - command: npx lerna bootstrap --scope ethereumjs-${CIRCLE_JOB} --ignore-scripts --include-dependencies --no-ci - - run: - name: Building target package and dependencies - command: npx lerna run --scope ethereumjs-${CIRCLE_JOB} --include-dependencies build - - run: - name: Running coverage tests - command: cd ~/project/packages/${CIRCLE_JOB} && npm run coverage - - run: - name: Codecov upload - command: curl -s https://codecov.io/bash | bash -s -- -f ~/project/packages/${CIRCLE_JOB}/coverage/lcov.info -F "${CIRCLE_JOB}" -t "${CODECOV_TOKEN}" -n "${CIRCLE_BUILD_NUM}" -y ".codecov.yml" -Z || echo 'Codecov upload failed' - -jobs: - account: - <<: *steps - block: - docker: - - image: circleci/node:10 - steps: - - checkout - - run: - name: Installing dependencies - command: cd ~/project/packages/${CIRCLE_JOB} && npm install - - run: - name: Running coverage tests - command: cd ~/project/packages/${CIRCLE_JOB} && npm run coverage - - run: - name: Codecov upload - command: curl -s https://codecov.io/bash | bash -s -- -f ~/project/packages/${CIRCLE_JOB}/coverage/lcov.info -F "${CIRCLE_JOB}" -t "${CODECOV_TOKEN}" -n "${CIRCLE_BUILD_NUM}" -y ".codecov.yml" -Z || echo 'Codecov upload failed' - blockchain: - <<: *steps - common: - <<: *steps - tx: - <<: *steps - vm: - <<: *steps - - - -workflows: - version: 2 - coverage: - jobs: - - account - - block - - blockchain - - common - - tx - - vm diff --git a/.github/workflows/account-build.yml b/.github/workflows/account-build.yml index e11d97fed78..33051f0b8b7 100644 --- a/.github/workflows/account-build.yml +++ b/.github/workflows/account-build.yml @@ -33,8 +33,9 @@ jobs: - run: npx lerna run build --scope ethereumjs-account --include-dependencies - run: npx lerna run lint --scope ethereumjs-account - run: npm test - env: - CI: true working-directory: '${{ env.cwd }}' + - uses: codecov/codecov-action@v1 + with: + file: '${{ env.cwd }}/coverage/lcov.info' env: cwd: '${{github.workspace}}/packages/account' diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml index fcb39afefab..2142e95741f 100644 --- a/.github/workflows/block-build.yml +++ b/.github/workflows/block-build.yml @@ -31,12 +31,11 @@ jobs: working-directory: '${{ env.cwd }}' - run: npx lerna run lint --scope ethereumjs-block - run: npm run test:node - env: - CI: true working-directory: '${{ env.cwd }}' - - run: 'npm run test:browser' - env: - CI: true + - run: npm run test:browser working-directory: '${{ env.cwd }}' + - uses: codecov/codecov-action@v1 + with: + file: '${{ env.cwd }}/coverage/lcov.info' env: cwd: '${{github.workspace}}/packages/block' diff --git a/.github/workflows/blockchain-build.yml b/.github/workflows/blockchain-build.yml index ff282b8e8e2..e12fb5e8ef9 100644 --- a/.github/workflows/blockchain-build.yml +++ b/.github/workflows/blockchain-build.yml @@ -33,8 +33,9 @@ jobs: - run: npx lerna run --scope ethereumjs-blockchain --include-dependencies build - run: npx lerna run lint --scope ethereumjs-blockchain - run: npm test - env: - CI: true working-directory: '${{ env.cwd }}' + - uses: codecov/codecov-action@v1 + with: + file: '${{ env.cwd }}/coverage/lcov.info' env: cwd: '${{github.workspace}}/packages/blockchain' diff --git a/.github/workflows/common-build.yml b/.github/workflows/common-build.yml index 84e0732d4c1..52712fa2a61 100644 --- a/.github/workflows/common-build.yml +++ b/.github/workflows/common-build.yml @@ -27,8 +27,9 @@ jobs: - run: npx lerna run --scope ethereumjs-common --include-dependencies build - run: npx lerna run lint --scope ethereumjs-common - run: npm test - env: - CI: true working-directory: '${{ env.cwd }}' + - uses: codecov/codecov-action@v1 + with: + file: '${{ env.cwd }}/coverage/lcov.info' env: cwd: '${{github.workspace}}/packages/common' diff --git a/.github/workflows/tx-bulid.yml b/.github/workflows/tx-bulid.yml index c17335f0f4a..33cbcd93fb5 100644 --- a/.github/workflows/tx-bulid.yml +++ b/.github/workflows/tx-bulid.yml @@ -28,13 +28,12 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-tx --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-tx --include-dependencies build - run: npx lerna run lint --scope ethereumjs-tx - - run: 'npm run test:node' - env: - CI: true + - run: npm run test:node working-directory: '${{ env.cwd }}' - - run: 'npm run test:browser' - env: - CI: true + - run: npm run test:browser working-directory: '${{ env.cwd }}' + - uses: codecov/codecov-action@v1 + with: + file: '${{ env.cwd }}/coverage/lcov.info' env: cwd: '${{github.workspace}}/packages/tx' diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml index 235e598707f..b059b975541 100644 --- a/.github/workflows/vm-build.yml +++ b/.github/workflows/vm-build.yml @@ -30,13 +30,9 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npx lerna run lint --scope ethereumjs-vm - - run: 'npm run test:API' - env: - CI: true + - run: npm run test:API working-directory: '${{ env.cwd }}' - - run: 'npm run test:API:browser' - env: - CI: true + - run: npm run test:API:browser working-directory: '${{ env.cwd }}' env: cwd: '${{github.workspace}}/packages/vm' @@ -49,10 +45,13 @@ jobs: - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: 'npm run test:state:selectedForks' - env: - CI: true + - run: npm run test:state:selectedForks working-directory: '${{ env.cwd }}' + - run: npm run coverage + working-directory: '${{ env.cwd }}' + - uses: codecov/codecov-action@v1 + with: + file: '${{ env.cwd }}/coverage/lcov.info' env: cwd: '${{github.workspace}}/packages/vm' test-vm-blockchain: @@ -64,9 +63,7 @@ jobs: - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: 'npm run test:blockchain' - env: - CI: true + - run: npm run test:blockchain working-directory: '${{ env.cwd }}' env: cwd: '${{github.workspace}}/packages/vm' diff --git a/.github/workflows/vm-nightly-test.yml b/.github/workflows/vm-nightly-test.yml index 7a4bd144bae..ed8123eea2a 100644 --- a/.github/workflows/vm-nightly-test.yml +++ b/.github/workflows/vm-nightly-test.yml @@ -12,13 +12,9 @@ jobs: - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: 'npm run test:API' - env: - CI: true + - run: npm run test:API working-directory: '${{ env.cwd }}' - - run: 'npm run test:API:browser' - env: - CI: true + - run: npm run test:API:browser working-directory: '${{ env.cwd }}' env: cwd: '${{github.workspace}}/packages/vm' @@ -31,9 +27,7 @@ jobs: - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: 'npm run test:state:allForks' - env: - CI: true + - run: npm run test:state:allForks working-directory: '${{ env.cwd }}' env: cwd: '${{github.workspace}}/packages/vm' @@ -46,9 +40,7 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build working-directory: '${{ env.cwd }}' - - run: 'npm run test:blockchain' - env: - CI: true + - run: npm run test:blockchain working-directory: '${{ env.cwd }}' env: cwd: '${{github.workspace}}/packages/vm' @@ -61,9 +53,7 @@ jobs: - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: 'npm run test:state:slow' - env: - CI: true + - run: npm run test:state:slow working-directory: '${{ env.cwd }}' env: cwd: '${{github.workspace}}/packages/vm' diff --git a/packages/account/package.json b/packages/account/package.json index 230b81b319e..a33f3d61b0b 100644 --- a/packages/account/package.json +++ b/packages/account/package.json @@ -14,7 +14,6 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", - "coverage": "npx nyc npm run test", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -23,7 +22,7 @@ "tsc": "ethereumjs-config-tsc", "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", - "test": "npx tape -r ts-node/register test/*.spec.ts" + "test": "nyc tape -r ts-node/register test/*.spec.ts" }, "keywords": [ "ethereum", diff --git a/packages/block/package.json b/packages/block/package.json index 504a3f5b5b8..e27338611bf 100644 --- a/packages/block/package.json +++ b/packages/block/package.json @@ -10,7 +10,6 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", - "coverage": "npx nyc npm run test:node", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -20,7 +19,7 @@ "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", "test": "npm run test:node && npm run test:browser", - "test:node": "npx tape -r ts-node/register test/*.spec.ts", + "test:node": "nyc tape -r ts-node/register test/*.spec.ts", "test:browser:build": "tsc && cp test/testdata/*.json test-build/test/testdata", "test:browser": "npm run test:browser:build && karma start karma.conf.js" }, diff --git a/packages/blockchain/package.json b/packages/blockchain/package.json index 15b59d2dbed..72034b71d14 100644 --- a/packages/blockchain/package.json +++ b/packages/blockchain/package.json @@ -10,8 +10,6 @@ "scripts": { "prepublishOnly": "npm run lint && npm run test && npm run build", "build": "ethereumjs-config-build", - "coverage": "ethereumjs-config-coverage", - "coveralls": "ethereumjs-config-coveralls", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -59,7 +57,6 @@ "@types/node": "^11.11.4", "@types/semaphore": "^1.1.0", "@types/tape": "^4.2.33", - "coveralls": "^3.0.2", "nyc": "^13.0.1", "prettier": "^1.16.4", "tape": "^4.9.1", diff --git a/packages/common/package.json b/packages/common/package.json index 50dd093747a..810e681e2b2 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -10,8 +10,6 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", - "coverage": "ethereumjs-config-coverage", - "coveralls": "ethereumjs-config-coveralls", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", "tslint": "ethereumjs-config-tslint", @@ -19,9 +17,7 @@ "tsc": "ethereumjs-config-tsc", "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", - "unitTests": "ts-node ./node_modules/tape/bin/tape ./tests/*.ts", - "test": "npm run lint && npm run unitTests", - "test:fix": "npm run lint:fix && npm run unitTests", + "test": "nyc ts-node ./node_modules/tape/bin/tape ./tests/*.ts", "docs:build": "typedoc --options typedoc.js" }, "repository": { @@ -50,7 +46,6 @@ "@ethereumjs/config-tslint": "^1.1.0", "@types/node": "^10.12.2", "@types/tape": "^4.2.33", - "coveralls": "^3.0.1", "nyc": "^11.7.1", "prettier": "^1.15.3", "tape": "^4.9.2", diff --git a/packages/tx/package.json b/packages/tx/package.json index b644fe70d8a..bb60866fd18 100644 --- a/packages/tx/package.json +++ b/packages/tx/package.json @@ -10,8 +10,6 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", - "coverage": "ethereumjs-config-coverage", - "coveralls": "ethereumjs-config-coveralls", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -21,7 +19,7 @@ "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", "test": "npm run test:node", - "test:node": "ts-node node_modules/tape/bin/tape ./test/index.ts", + "test:node": "nyc ts-node node_modules/tape/bin/tape ./test/index.ts", "test:browser:build": "tsc && cp ./test/*.json test-build/test/", "test:browser": "npm run test:browser:build && karma start karma.conf.js" }, @@ -46,7 +44,6 @@ "@types/tape": "^4.2.33", "browserify": "^16.2.3", "contributor": "^0.1.25", - "coveralls": "^2.11.4", "ethereumjs-testing": "git+https://github.com/ethereumjs/ethereumjs-testing.git#v1.3.0", "istanbul": "^0.4.1", "karma": "^4.1.0", From 9b263be7ef815cfeb1305aa4272729c6c3ce1732 Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Sat, 16 May 2020 17:50:49 -0700 Subject: [PATCH 02/11] add missing checkout for nightly run --- .github/workflows/vm-nightly-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vm-nightly-test.yml b/.github/workflows/vm-nightly-test.yml index ed8123eea2a..61557d3fcf7 100644 --- a/.github/workflows/vm-nightly-test.yml +++ b/.github/workflows/vm-nightly-test.yml @@ -37,9 +37,9 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 12.x + - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - working-directory: '${{ env.cwd }}' - run: npm run test:blockchain working-directory: '${{ env.cwd }}' env: From 7025ca547dc01763e7d106879e35131672e6e20c Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Sat, 16 May 2020 18:14:14 -0700 Subject: [PATCH 03/11] add codecov flags --- .github/workflows/account-build.yml | 1 + .github/workflows/block-build.yml | 1 + .github/workflows/blockchain-build.yml | 1 + .github/workflows/common-build.yml | 1 + .github/workflows/tx-bulid.yml | 1 + .github/workflows/vm-build.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/.github/workflows/account-build.yml b/.github/workflows/account-build.yml index 33051f0b8b7..ad8f63203e8 100644 --- a/.github/workflows/account-build.yml +++ b/.github/workflows/account-build.yml @@ -37,5 +37,6 @@ jobs: - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' + flags: account env: cwd: '${{github.workspace}}/packages/account' diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml index 2142e95741f..afc6901d458 100644 --- a/.github/workflows/block-build.yml +++ b/.github/workflows/block-build.yml @@ -37,5 +37,6 @@ jobs: - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' + flags: block env: cwd: '${{github.workspace}}/packages/block' diff --git a/.github/workflows/blockchain-build.yml b/.github/workflows/blockchain-build.yml index e12fb5e8ef9..7f2132352c1 100644 --- a/.github/workflows/blockchain-build.yml +++ b/.github/workflows/blockchain-build.yml @@ -37,5 +37,6 @@ jobs: - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' + flags: blockchain env: cwd: '${{github.workspace}}/packages/blockchain' diff --git a/.github/workflows/common-build.yml b/.github/workflows/common-build.yml index 52712fa2a61..dd727f39aa6 100644 --- a/.github/workflows/common-build.yml +++ b/.github/workflows/common-build.yml @@ -31,5 +31,6 @@ jobs: - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' + flags: common env: cwd: '${{github.workspace}}/packages/common' diff --git a/.github/workflows/tx-bulid.yml b/.github/workflows/tx-bulid.yml index 33cbcd93fb5..e732e0ae3f7 100644 --- a/.github/workflows/tx-bulid.yml +++ b/.github/workflows/tx-bulid.yml @@ -35,5 +35,6 @@ jobs: - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' + flags: tx env: cwd: '${{github.workspace}}/packages/tx' diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml index b059b975541..0c3787be246 100644 --- a/.github/workflows/vm-build.yml +++ b/.github/workflows/vm-build.yml @@ -52,6 +52,7 @@ jobs: - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' + flags: vm env: cwd: '${{github.workspace}}/packages/vm' test-vm-blockchain: From 5956452dba9e7c2c0745786e35c5db4e98af0af2 Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Wed, 27 May 2020 10:15:21 -0700 Subject: [PATCH 04/11] re-add coverage scripts move `env` to above `steps` --- .github/workflows/account-build.yml | 8 +++++--- .github/workflows/block-build.yml | 8 +++++--- .github/workflows/blockchain-build.yml | 8 +++++--- .github/workflows/common-build.yml | 8 +++++--- .github/workflows/tx-bulid.yml | 8 +++++--- .github/workflows/vm-build.yml | 14 +++++++------- .github/workflows/vm-nightly-test.yml | 18 +++++++++--------- packages/account/.eslintrc.js | 6 ++++++ packages/account/package.json | 3 ++- packages/account/tsconfig.eslint.json | 4 ++++ packages/block/package.json | 3 ++- packages/blockchain/package.json | 3 ++- packages/common/package.json | 3 ++- packages/tx/package.json | 3 ++- packages/vm/.eslintrc.js | 6 ++++++ 15 files changed, 67 insertions(+), 36 deletions(-) create mode 100644 packages/account/.eslintrc.js create mode 100644 packages/account/tsconfig.eslint.json create mode 100644 packages/vm/.eslintrc.js diff --git a/.github/workflows/account-build.yml b/.github/workflows/account-build.yml index ad8f63203e8..8e4dd9b0ecc 100644 --- a/.github/workflows/account-build.yml +++ b/.github/workflows/account-build.yml @@ -1,5 +1,5 @@ name: Account -'on': +on: push: branches: - master @@ -23,6 +23,8 @@ jobs: strategy: matrix: node-version: [10.x, 12.x, 13.x, 14.x] + env: + cwd: '${{github.workspace}}/packages/account' steps: - name: 'Use Node.js ${{ matrix.node-version }}' uses: actions/setup-node@v1 @@ -34,9 +36,9 @@ jobs: - run: npx lerna run lint --scope ethereumjs-account - run: npm test working-directory: '${{ env.cwd }}' + - run: npm run coverage + working-directory: '${{ env.cwd }}' - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' flags: account - env: - cwd: '${{github.workspace}}/packages/account' diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml index afc6901d458..6e295748ccb 100644 --- a/.github/workflows/block-build.yml +++ b/.github/workflows/block-build.yml @@ -1,5 +1,5 @@ name: Block -'on': +on: push: branches: - master @@ -21,6 +21,8 @@ jobs: strategy: matrix: node-version: [10.x, 12.x, 13.x, 14.x] + env: + cwd: '${{github.workspace}}/packages/block' steps: - name: 'Use Node.js ${{ matrix.node-version }}' uses: actions/setup-node@v1 @@ -34,9 +36,9 @@ jobs: working-directory: '${{ env.cwd }}' - run: npm run test:browser working-directory: '${{ env.cwd }}' + - run: npm run coverage + working-directory: '${{ env.cwd }}' - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' flags: block - env: - cwd: '${{github.workspace}}/packages/block' diff --git a/.github/workflows/blockchain-build.yml b/.github/workflows/blockchain-build.yml index 7f2132352c1..ff7c186846d 100644 --- a/.github/workflows/blockchain-build.yml +++ b/.github/workflows/blockchain-build.yml @@ -1,5 +1,5 @@ name: Blockchain -'on': +on: push: branches: - master @@ -23,6 +23,8 @@ jobs: strategy: matrix: node-version: [10.x, 12.x, 13.x, 14.x] + env: + cwd: '${{github.workspace}}/packages/blockchain' steps: - name: 'Use Node.js ${{ matrix.node-version }}' uses: actions/setup-node@v1 @@ -34,9 +36,9 @@ jobs: - run: npx lerna run lint --scope ethereumjs-blockchain - run: npm test working-directory: '${{ env.cwd }}' + - run: npm run coverage + working-directory: '${{ env.cwd }}' - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' flags: blockchain - env: - cwd: '${{github.workspace}}/packages/blockchain' diff --git a/.github/workflows/common-build.yml b/.github/workflows/common-build.yml index dd727f39aa6..95c6183ac66 100644 --- a/.github/workflows/common-build.yml +++ b/.github/workflows/common-build.yml @@ -1,5 +1,5 @@ name: Common -'on': +on: push: branches: - master @@ -17,6 +17,8 @@ jobs: strategy: matrix: node-version: [10.x, 12.x, 13.x, 14.x] + env: + cwd: '${{github.workspace}}/packages/common' steps: - name: 'Use Node.js ${{ matrix.node-version }}' uses: actions/setup-node@v1 @@ -28,9 +30,9 @@ jobs: - run: npx lerna run lint --scope ethereumjs-common - run: npm test working-directory: '${{ env.cwd }}' + - run: npm run coverage + working-directory: '${{ env.cwd }}' - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' flags: common - env: - cwd: '${{github.workspace}}/packages/common' diff --git a/.github/workflows/tx-bulid.yml b/.github/workflows/tx-bulid.yml index e732e0ae3f7..01bdc5f498b 100644 --- a/.github/workflows/tx-bulid.yml +++ b/.github/workflows/tx-bulid.yml @@ -1,5 +1,5 @@ name: Tx -'on': +on: push: branches: - master @@ -19,6 +19,8 @@ jobs: strategy: matrix: node-version: [10.x, 12.x, 13.x, 14.x] + env: + cwd: '${{github.workspace}}/packages/tx' steps: - name: 'Use Node.js ${{ matrix.node-version }}' uses: actions/setup-node@v1 @@ -32,9 +34,9 @@ jobs: working-directory: '${{ env.cwd }}' - run: npm run test:browser working-directory: '${{ env.cwd }}' + - run: npm run coverage + working-directory: '${{ env.cwd }}' - uses: codecov/codecov-action@v1 with: file: '${{ env.cwd }}/coverage/lcov.info' flags: tx - env: - cwd: '${{github.workspace}}/packages/tx' diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml index 0c3787be246..2a5835687a5 100644 --- a/.github/workflows/vm-build.yml +++ b/.github/workflows/vm-build.yml @@ -1,5 +1,5 @@ name: VM -'on': +on: push: branches: - master @@ -22,6 +22,8 @@ name: VM jobs: test-vm-api: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -34,10 +36,10 @@ jobs: working-directory: '${{ env.cwd }}' - run: npm run test:API:browser working-directory: '${{ env.cwd }}' - env: - cwd: '${{github.workspace}}/packages/vm' test-vm-state: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -53,10 +55,10 @@ jobs: with: file: '${{ env.cwd }}/coverage/lcov.info' flags: vm - env: - cwd: '${{github.workspace}}/packages/vm' test-vm-blockchain: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -66,5 +68,3 @@ jobs: - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:blockchain working-directory: '${{ env.cwd }}' - env: - cwd: '${{github.workspace}}/packages/vm' diff --git a/.github/workflows/vm-nightly-test.yml b/.github/workflows/vm-nightly-test.yml index 61557d3fcf7..1be4b7bf807 100644 --- a/.github/workflows/vm-nightly-test.yml +++ b/.github/workflows/vm-nightly-test.yml @@ -1,10 +1,12 @@ name: VM Nightly -'on': +on: schedule: - cron: 0 0 * * * jobs: test-vm-api: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -16,10 +18,10 @@ jobs: working-directory: '${{ env.cwd }}' - run: npm run test:API:browser working-directory: '${{ env.cwd }}' - env: - cwd: '${{github.workspace}}/packages/vm' test-vm-state: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -29,10 +31,10 @@ jobs: - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:state:allForks working-directory: '${{ env.cwd }}' - env: - cwd: '${{github.workspace}}/packages/vm' test-vm-blockchain: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -42,10 +44,10 @@ jobs: - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:blockchain working-directory: '${{ env.cwd }}' - env: - cwd: '${{github.workspace}}/packages/vm' test-vm-slow: runs-on: ubuntu-latest + env: + cwd: '${{github.workspace}}/packages/vm' steps: - uses: actions/setup-node@v1 with: @@ -55,5 +57,3 @@ jobs: - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:state:slow working-directory: '${{ env.cwd }}' - env: - cwd: '${{github.workspace}}/packages/vm' diff --git a/packages/account/.eslintrc.js b/packages/account/.eslintrc.js new file mode 100644 index 00000000000..7b3e9dd5436 --- /dev/null +++ b/packages/account/.eslintrc.js @@ -0,0 +1,6 @@ +module.exports = { + extends: '@ethereumjs/eslint-config-helper', + parserOptions: { + project: './tsconfig.eslint.json', + }, +} diff --git a/packages/account/package.json b/packages/account/package.json index a33f3d61b0b..fa1fafabbfd 100644 --- a/packages/account/package.json +++ b/packages/account/package.json @@ -14,6 +14,7 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", + "coverage": "ethereumjs-config-coverage", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -22,7 +23,7 @@ "tsc": "ethereumjs-config-tsc", "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", - "test": "nyc tape -r ts-node/register test/*.spec.ts" + "test": "tape -r ts-node/register test/*.spec.ts" }, "keywords": [ "ethereum", diff --git a/packages/account/tsconfig.eslint.json b/packages/account/tsconfig.eslint.json new file mode 100644 index 00000000000..1fc6fca730b --- /dev/null +++ b/packages/account/tsconfig.eslint.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts", ".eslintrc.js", "prettier.config.js", "typedoc.js"] +} diff --git a/packages/block/package.json b/packages/block/package.json index e27338611bf..1308ac7432e 100644 --- a/packages/block/package.json +++ b/packages/block/package.json @@ -10,6 +10,7 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", + "coverage": "ethereumjs-config-coverage", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -19,7 +20,7 @@ "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", "test": "npm run test:node && npm run test:browser", - "test:node": "nyc tape -r ts-node/register test/*.spec.ts", + "test:node": "tape -r ts-node/register test/*.spec.ts", "test:browser:build": "tsc && cp test/testdata/*.json test-build/test/testdata", "test:browser": "npm run test:browser:build && karma start karma.conf.js" }, diff --git a/packages/blockchain/package.json b/packages/blockchain/package.json index 72034b71d14..6dd703afaba 100644 --- a/packages/blockchain/package.json +++ b/packages/blockchain/package.json @@ -10,6 +10,7 @@ "scripts": { "prepublishOnly": "npm run lint && npm run test && npm run build", "build": "ethereumjs-config-build", + "coverage": "ethereumjs-config-coverage", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -18,7 +19,7 @@ "tsc": "ethereumjs-config-tsc", "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", - "test": "nyc --reporter=lcov ts-node node_modules/tape/bin/tape ./test/index.ts" + "test": "ts-node node_modules/tape/bin/tape ./test/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/package.json b/packages/common/package.json index 810e681e2b2..331d415a64e 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -10,6 +10,7 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", + "coverage": "ethereumjs-config-coverage", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", "tslint": "ethereumjs-config-tslint", @@ -17,7 +18,7 @@ "tsc": "ethereumjs-config-tsc", "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", - "test": "nyc ts-node ./node_modules/tape/bin/tape ./tests/*.ts", + "test": "ts-node ./node_modules/tape/bin/tape ./tests/*.ts", "docs:build": "typedoc --options typedoc.js" }, "repository": { diff --git a/packages/tx/package.json b/packages/tx/package.json index bb60866fd18..b8c7aae6323 100644 --- a/packages/tx/package.json +++ b/packages/tx/package.json @@ -10,6 +10,7 @@ "scripts": { "build": "ethereumjs-config-build", "prepublishOnly": "npm run test && npm run build", + "coverage": "ethereumjs-config-coverage", "docs:build": "typedoc --options typedoc.js", "format": "ethereumjs-config-format", "format:fix": "ethereumjs-config-format-fix", @@ -19,7 +20,7 @@ "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", "test": "npm run test:node", - "test:node": "nyc ts-node node_modules/tape/bin/tape ./test/index.ts", + "test:node": "ts-node node_modules/tape/bin/tape ./test/index.ts", "test:browser:build": "tsc && cp ./test/*.json test-build/test/", "test:browser": "npm run test:browser:build && karma start karma.conf.js" }, diff --git a/packages/vm/.eslintrc.js b/packages/vm/.eslintrc.js new file mode 100644 index 00000000000..5ba1febf339 --- /dev/null +++ b/packages/vm/.eslintrc.js @@ -0,0 +1,6 @@ +module.exports = { + // extends: "@ethereumjs/config-lint", + parserOptions: { + project: './tsconfig.json', + } +}; \ No newline at end of file From 93075dd59a1864de00f6047473ec7ef43ebd9954 Mon Sep 17 00:00:00 2001 From: cgewecke Date: Wed, 27 May 2020 15:34:11 -0700 Subject: [PATCH 05/11] Add common boilerplate for Berlin hardfork --- packages/common/src/chains/goerli.json | 6 ++++++ packages/common/src/chains/mainnet.json | 6 ++++++ packages/common/src/chains/rinkeby.json | 6 ++++++ packages/common/src/chains/ropsten.json | 6 ++++++ packages/common/src/hardforks/berlin.json | 14 ++++++++++++++ packages/common/src/hardforks/index.ts | 1 + packages/common/tests/hardforks.ts | 1 + 7 files changed, 40 insertions(+) create mode 100644 packages/common/src/hardforks/berlin.json diff --git a/packages/common/src/chains/goerli.json b/packages/common/src/chains/goerli.json index cd194e43b74..8aeaa7441b5 100644 --- a/packages/common/src/chains/goerli.json +++ b/packages/common/src/chains/goerli.json @@ -67,6 +67,12 @@ "block": 1561651, "consensus": "poa", "finality": null + }, + { + "name": "berlin", + "block": null, + "consensus": "poa", + "finality": null } ], "bootstrapNodes": [ diff --git a/packages/common/src/chains/mainnet.json b/packages/common/src/chains/mainnet.json index 10a88d4104f..34618c7851a 100644 --- a/packages/common/src/chains/mainnet.json +++ b/packages/common/src/chains/mainnet.json @@ -73,6 +73,12 @@ "block": 9200000, "consensus": "pow", "finality": null + }, + { + "name": "berlin", + "block": null, + "consensus": "pow", + "finality": null } ], "bootstrapNodes": [ diff --git a/packages/common/src/chains/rinkeby.json b/packages/common/src/chains/rinkeby.json index 5b357ddc9f3..fb085d93283 100644 --- a/packages/common/src/chains/rinkeby.json +++ b/packages/common/src/chains/rinkeby.json @@ -67,6 +67,12 @@ "block": 5435345, "consensus": "poa", "finality": null + }, + { + "name": "berlin", + "block": null, + "consensus": "poa", + "finality": null } ], "bootstrapNodes": [ diff --git a/packages/common/src/chains/ropsten.json b/packages/common/src/chains/ropsten.json index e82becf92d0..8bd5c8f29f8 100644 --- a/packages/common/src/chains/ropsten.json +++ b/packages/common/src/chains/ropsten.json @@ -73,6 +73,12 @@ "block": 7117117, "consensus": "pow", "finality": null + }, + { + "name": "berlin", + "block": null, + "consensus": "pow", + "finality": null } ], "bootstrapNodes": [ diff --git a/packages/common/src/hardforks/berlin.json b/packages/common/src/hardforks/berlin.json new file mode 100644 index 00000000000..62b1009256f --- /dev/null +++ b/packages/common/src/hardforks/berlin.json @@ -0,0 +1,14 @@ +{ + "name": "berlin", + "comment": "HF targeted for July 2020 following the Muir Glacier HF", + "eip": { + "url": "https://eips.ethereum.org/EIPS/eip-2070", + "status": "Draft" + }, + "gasConfig": {}, + "gasPrices": {}, + "vm": {}, + "pow": {}, + "casper": {}, + "sharding": {} +} diff --git a/packages/common/src/hardforks/index.ts b/packages/common/src/hardforks/index.ts index a63630d4ce3..a447510af46 100644 --- a/packages/common/src/hardforks/index.ts +++ b/packages/common/src/hardforks/index.ts @@ -9,4 +9,5 @@ export const hardforks = [ ['petersburg', require('./petersburg.json')], ['istanbul', require('./istanbul.json')], ['muirGlacier', require('./muirGlacier.json')], + ['berlin', require('./berlin.json')], ] diff --git a/packages/common/tests/hardforks.ts b/packages/common/tests/hardforks.ts index 0281f75fe36..fdeec82ddc7 100644 --- a/packages/common/tests/hardforks.ts +++ b/packages/common/tests/hardforks.ts @@ -13,6 +13,7 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) { 'constantinople', 'petersburg', 'istanbul', + 'berlin', ] let c From e7847df0ea986362d0fe104777883cddd6716b78 Mon Sep 17 00:00:00 2001 From: cgewecke Date: Thu, 28 May 2020 09:24:32 -0700 Subject: [PATCH 06/11] Add berlin to kovan chain --- packages/common/src/chains/kovan.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/common/src/chains/kovan.json b/packages/common/src/chains/kovan.json index 953ed371966..d4c7db1f9e6 100644 --- a/packages/common/src/chains/kovan.json +++ b/packages/common/src/chains/kovan.json @@ -67,6 +67,12 @@ "block": 14111141, "consensus": "poa", "finality": null + }, + { + "name": "berlin", + "block": null, + "consensus": "poa", + "finality": null } ], "bootstrapNodes": [ From 256d656da6d72531ff9569bee8e2b2d9feb6a5cf Mon Sep 17 00:00:00 2001 From: Holger Drewes Date: Mon, 1 Jun 2020 17:21:04 +0200 Subject: [PATCH 07/11] Update to ethereumjs-testing v1.3.1 (pre-Berlin HF release) / Fix test runs (#743) * Updated ethereumjs-testing to v1.3.1 (pre-Berlin HF release) * Added additionally used exception-on-all-forks naming convention to blockchain test runner * Added blockchain tests to skip broken list * Added SHA3 blockchain tests to skip list due to unclear test situation * Added VM performance tests to the slow test SKIP list --- packages/vm/package.json | 2 +- packages/vm/tests/BlockchainTestsRunner.js | 7 +++++-- packages/vm/tests/config.js | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/vm/package.json b/packages/vm/package.json index 0f75c9c5404..f684ad620c7 100644 --- a/packages/vm/package.json +++ b/packages/vm/package.json @@ -67,7 +67,7 @@ "@types/node": "^11.13.4", "@types/tape": "^4.2.33", "browserify": "^16.5.1", - "ethereumjs-testing": "git+https://github.com/ethereumjs/ethereumjs-testing.git#v1.3.0", + "ethereumjs-testing": "git+https://github.com/ethereumjs/ethereumjs-testing.git#v1.3.1", "karma": "^4.0.1", "karma-browserify": "^6.0.0", "karma-chrome-launcher": "^2.2.0", diff --git a/packages/vm/tests/BlockchainTestsRunner.js b/packages/vm/tests/BlockchainTestsRunner.js index 489273d6510..7df1514d634 100644 --- a/packages/vm/tests/BlockchainTestsRunner.js +++ b/packages/vm/tests/BlockchainTestsRunner.js @@ -86,8 +86,11 @@ module.exports = async function runBlockchainTest(options, testData, t) { for (const raw of testData.blocks) { const paramFork = `expectException${options.forkConfigTestSuite}` - const paramAll = 'expectExceptionALL' - const expectException = raw[paramFork] ? raw[paramFork] : raw[paramAll] + // Two naming conventions in ethereum/tests to indicate "exception occurs on all HFs" semantics + // Last checked: ethereumjs-testing v1.3.1 (2020-05-11) + const paramAll1 = 'expectExceptionALL' + const paramAll2 = 'expectException' + const expectException = raw[paramFork] ? raw[paramFork] : (raw[paramAll1] || raw[paramAll2]) try { const block = new Block(Buffer.from(raw.rlp.slice(2), 'hex'), { diff --git a/packages/vm/tests/config.js b/packages/vm/tests/config.js index e08bf8718de..2c3bca19793 100644 --- a/packages/vm/tests/config.js +++ b/packages/vm/tests/config.js @@ -10,6 +10,11 @@ const SKIP_BROKEN = [ 'ForkStressTest', // Only BlockchainTest, temporary till fixed (2020-05-23) 'dynamicAccountOverwriteEmpty', // temporary till fixed (2019-01-30), skipped along constantinopleFix work time constraints 'ChainAtoChainB', // Only BlockchainTest, temporary, along expectException fixes (2020-05-23) + 'BLOCK_timestamp_TooLarge', // Only BlockchainTest, temporary, along expectException fixes (2020-05-27) + 'sha3_bigOffset', // SHA3: Only BlockchainTest, unclear SHA3 test situation (2020-05-28) + 'sha3_memSizeNoQuadraticCost', // SHA3: See also: + 'sha3_memSizeQuadraticCost', // SHA3: https://github.com/ethereumjs/ethereumjs-vm/pull/743#issuecomment-635116418 + 'sha3_bigSize', // SHA3 ] /** @@ -60,6 +65,15 @@ const SKIP_SLOW = [ 'QuadraticComplexitySolidity_CallDataCopy', 'CALLBlake2f_MaxRounds', 'randomStatetest94_Istanbul', + // vmPerformance tests + 'ackermann', + 'fibonacci', + 'loop-add-10M', + 'loop-divadd-10M', + 'loop-divadd-unr100-10M', + 'loop-exp', + 'loop-mul', + 'manyFunctions100', ] /** From b1f0ff24881d3cd2b254559fb726a8e2e6aafe1c Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Mon, 1 Jun 2020 12:19:20 -0700 Subject: [PATCH 08/11] only run coverage on one node-version --- .github/workflows/account-build.yml | 17 ++++++++++------- .github/workflows/block-build.yml | 21 ++++++++++++--------- .github/workflows/blockchain-build.yml | 17 ++++++++++------- .github/workflows/common-build.yml | 17 ++++++++++------- .github/workflows/tx-bulid.yml | 19 +++++++++++-------- .github/workflows/vm-build.yml | 18 +++++++++--------- .github/workflows/vm-nightly-test.yml | 18 +++++++++--------- 7 files changed, 71 insertions(+), 56 deletions(-) diff --git a/.github/workflows/account-build.yml b/.github/workflows/account-build.yml index 8e4dd9b0ecc..faade4b35f0 100644 --- a/.github/workflows/account-build.yml +++ b/.github/workflows/account-build.yml @@ -22,23 +22,26 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x, 12.x, 13.x, 14.x] + node-version: [10, 12, 13, 14] env: - cwd: '${{github.workspace}}/packages/account' + cwd: ${{github.workspace}}/packages/account steps: - - name: 'Use Node.js ${{ matrix.node-version }}' + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: - node-version: '${{ matrix.node-version }}' + node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-account --ignore-scripts --include-dependencies --no-ci - run: npx lerna run build --scope ethereumjs-account --include-dependencies - run: npx lerna run lint --scope ethereumjs-account - run: npm test - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + - run: npm run coverage - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + if: ${{ matrix.node-version == 12 }} - uses: codecov/codecov-action@v1 with: - file: '${{ env.cwd }}/coverage/lcov.info' + file: ${{ env.cwd }}/coverage/lcov.info flags: account + if: ${{ matrix.node-version == 12 }} diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml index 6e295748ccb..dbece80f695 100644 --- a/.github/workflows/block-build.yml +++ b/.github/workflows/block-build.yml @@ -20,25 +20,28 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x, 12.x, 13.x, 14.x] + node-version: [10, 12, 13, 14] env: - cwd: '${{github.workspace}}/packages/block' + cwd: ${{github.workspace}}/packages/block steps: - - name: 'Use Node.js ${{ matrix.node-version }}' + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: - node-version: '${{ matrix.node-version }}' + node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 - run: npm install - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - run: npx lerna run lint --scope ethereumjs-block - run: npm run test:node - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - run: npm run test:browser - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + - run: npm run coverage - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + if: ${{ matrix.node-version == 12 } - uses: codecov/codecov-action@v1 with: - file: '${{ env.cwd }}/coverage/lcov.info' + file: ${{ env.cwd }}/coverage/lcov.info flags: block + if: ${{ matrix.node-version == 12 } diff --git a/.github/workflows/blockchain-build.yml b/.github/workflows/blockchain-build.yml index ff7c186846d..201b8122cd8 100644 --- a/.github/workflows/blockchain-build.yml +++ b/.github/workflows/blockchain-build.yml @@ -22,23 +22,26 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x, 12.x, 13.x, 14.x] + node-version: [10, 12, 13, 14] env: - cwd: '${{github.workspace}}/packages/blockchain' + cwd: ${{github.workspace}}/packages/blockchain steps: - - name: 'Use Node.js ${{ matrix.node-version }}' + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: - node-version: '${{ matrix.node-version }}' + node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-blockchain --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-blockchain --include-dependencies build - run: npx lerna run lint --scope ethereumjs-blockchain - run: npm test - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + - run: npm run coverage - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + if: ${{ matrix.node-version == 12 } - uses: codecov/codecov-action@v1 with: - file: '${{ env.cwd }}/coverage/lcov.info' + file: ${{ env.cwd }}/coverage/lcov.info flags: blockchain + if: ${{ matrix.node-version == 12 } diff --git a/.github/workflows/common-build.yml b/.github/workflows/common-build.yml index 95c6183ac66..10ffc7a7542 100644 --- a/.github/workflows/common-build.yml +++ b/.github/workflows/common-build.yml @@ -16,23 +16,26 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x, 12.x, 13.x, 14.x] + node-version: [10, 12, 13, 14] env: - cwd: '${{github.workspace}}/packages/common' + cwd: ${{github.workspace}}/packages/common steps: - - name: 'Use Node.js ${{ matrix.node-version }}' + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: - node-version: '${{ matrix.node-version }}' + node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-common --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-common --include-dependencies build - run: npx lerna run lint --scope ethereumjs-common - run: npm test - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + - run: npm run coverage - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + if: ${{ matrix.node-version == 12 - uses: codecov/codecov-action@v1 with: - file: '${{ env.cwd }}/coverage/lcov.info' + file: ${{ env.cwd }}/coverage/lcov.info flags: common + if: ${{ matrix.node-version == 12 diff --git a/.github/workflows/tx-bulid.yml b/.github/workflows/tx-bulid.yml index 01bdc5f498b..d30f8112227 100644 --- a/.github/workflows/tx-bulid.yml +++ b/.github/workflows/tx-bulid.yml @@ -18,25 +18,28 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [10.x, 12.x, 13.x, 14.x] + node-version: [10, 12, 13, 14] env: - cwd: '${{github.workspace}}/packages/tx' + cwd: ${{github.workspace}}/packages/tx steps: - - name: 'Use Node.js ${{ matrix.node-version }}' + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: - node-version: '${{ matrix.node-version }}' + node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-tx --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-tx --include-dependencies build - run: npx lerna run lint --scope ethereumjs-tx - run: npm run test:node - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - run: npm run test:browser - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + - run: npm run coverage - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} + if: ${{ matrix.node-version == 12 - uses: codecov/codecov-action@v1 with: - file: '${{ env.cwd }}/coverage/lcov.info' + file: ${{ env.cwd }}/coverage/lcov.info flags: tx + if: ${{ matrix.node-version == 12 diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml index 2a5835687a5..9a19fcbabef 100644 --- a/.github/workflows/vm-build.yml +++ b/.github/workflows/vm-build.yml @@ -23,7 +23,7 @@ jobs: test-vm-api: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -33,13 +33,13 @@ jobs: - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npx lerna run lint --scope ethereumjs-vm - run: npm run test:API - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - run: npm run test:API:browser - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} test-vm-state: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -48,17 +48,17 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:state:selectedForks - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - run: npm run coverage - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - uses: codecov/codecov-action@v1 with: - file: '${{ env.cwd }}/coverage/lcov.info' + file: ${{ env.cwd }}/coverage/lcov.info flags: vm test-vm-blockchain: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -67,4 +67,4 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:blockchain - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} diff --git a/.github/workflows/vm-nightly-test.yml b/.github/workflows/vm-nightly-test.yml index 1be4b7bf807..64756620fa6 100644 --- a/.github/workflows/vm-nightly-test.yml +++ b/.github/workflows/vm-nightly-test.yml @@ -6,7 +6,7 @@ jobs: test-vm-api: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -15,13 +15,13 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:API - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} - run: npm run test:API:browser - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} test-vm-state: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -30,11 +30,11 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:state:allForks - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} test-vm-blockchain: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -43,11 +43,11 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:blockchain - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} test-vm-slow: runs-on: ubuntu-latest env: - cwd: '${{github.workspace}}/packages/vm' + cwd: ${{github.workspace}}/packages/vm steps: - uses: actions/setup-node@v1 with: @@ -56,4 +56,4 @@ jobs: - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - run: npm run test:state:slow - working-directory: '${{ env.cwd }}' + working-directory: ${{ env.cwd }} From 0929ecfd5dbfca60435db312d4e010e507b7d888 Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Mon, 1 Jun 2020 12:40:06 -0700 Subject: [PATCH 09/11] convert `npm run` cmds to `lerna run --scope` --- .github/workflows/account-build.yml | 8 +++----- .github/workflows/block-build.yml | 10 ++++------ .github/workflows/blockchain-build.yml | 12 +++++------- .github/workflows/common-build.yml | 12 +++++------- .github/workflows/tx-bulid.yml | 14 +++++--------- .github/workflows/vm-build.yml | 21 ++++++++------------- .github/workflows/vm-nightly-test.yml | 23 +++++++++-------------- packages/account/.eslintrc.js | 6 ------ packages/account/tsconfig.eslint.json | 4 ---- packages/tx/package.json | 2 +- packages/vm/.eslintrc.js | 6 ------ 11 files changed, 40 insertions(+), 78 deletions(-) delete mode 100644 packages/account/.eslintrc.js delete mode 100644 packages/account/tsconfig.eslint.json delete mode 100644 packages/vm/.eslintrc.js diff --git a/.github/workflows/account-build.yml b/.github/workflows/account-build.yml index faade4b35f0..01d4bfe63da 100644 --- a/.github/workflows/account-build.yml +++ b/.github/workflows/account-build.yml @@ -31,15 +31,13 @@ jobs: with: node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 + - run: npx lerna bootstrap --scope ethereumjs-account --ignore-scripts --include-dependencies --no-ci - run: npx lerna run build --scope ethereumjs-account --include-dependencies - run: npx lerna run lint --scope ethereumjs-account - - run: npm test - working-directory: ${{ env.cwd }} - - run: npm run coverage - working-directory: ${{ env.cwd }} - if: ${{ matrix.node-version == 12 }} + - run: npx lerna run coverage --scope ethereumjs-account + - uses: codecov/codecov-action@v1 with: file: ${{ env.cwd }}/coverage/lcov.info diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml index dbece80f695..7fd88c65b8e 100644 --- a/.github/workflows/block-build.yml +++ b/.github/workflows/block-build.yml @@ -29,19 +29,17 @@ jobs: with: node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 + - run: npm install working-directory: ${{ env.cwd }} + - run: npx lerna run lint --scope ethereumjs-block - - run: npm run test:node - working-directory: ${{ env.cwd }} - - run: npm run test:browser - working-directory: ${{ env.cwd }} - run: npm run coverage working-directory: ${{ env.cwd }} - if: ${{ matrix.node-version == 12 } + - uses: codecov/codecov-action@v1 with: file: ${{ env.cwd }}/coverage/lcov.info flags: block - if: ${{ matrix.node-version == 12 } + if: ${{ matrix.node-version == 12 }} diff --git a/.github/workflows/blockchain-build.yml b/.github/workflows/blockchain-build.yml index 201b8122cd8..ef08066da8e 100644 --- a/.github/workflows/blockchain-build.yml +++ b/.github/workflows/blockchain-build.yml @@ -31,17 +31,15 @@ jobs: with: node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 + - run: npx lerna bootstrap --scope ethereumjs-blockchain --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-blockchain --include-dependencies build + - run: npx lerna run build --scope ethereumjs-blockchain --include-dependencies - run: npx lerna run lint --scope ethereumjs-blockchain - - run: npm test - working-directory: ${{ env.cwd }} - - run: npm run coverage - working-directory: ${{ env.cwd }} - if: ${{ matrix.node-version == 12 } + - run: npx lerna run coverage --scope ethereumjs-blockchain + - uses: codecov/codecov-action@v1 with: file: ${{ env.cwd }}/coverage/lcov.info flags: blockchain - if: ${{ matrix.node-version == 12 } + if: ${{ matrix.node-version == 12 }} diff --git a/.github/workflows/common-build.yml b/.github/workflows/common-build.yml index 10ffc7a7542..9c3950b5039 100644 --- a/.github/workflows/common-build.yml +++ b/.github/workflows/common-build.yml @@ -25,17 +25,15 @@ jobs: with: node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 + - run: npx lerna bootstrap --scope ethereumjs-common --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-common --include-dependencies build + - run: npx lerna run build --scope ethereumjs-common --include-dependencies - run: npx lerna run lint --scope ethereumjs-common - - run: npm test - working-directory: ${{ env.cwd }} - - run: npm run coverage - working-directory: ${{ env.cwd }} - if: ${{ matrix.node-version == 12 + - run: npx lerna run coverage --scope ethereumjs-common + - uses: codecov/codecov-action@v1 with: file: ${{ env.cwd }}/coverage/lcov.info flags: common - if: ${{ matrix.node-version == 12 + if: ${{ matrix.node-version == 12 }} diff --git a/.github/workflows/tx-bulid.yml b/.github/workflows/tx-bulid.yml index d30f8112227..9e7dc20055d 100644 --- a/.github/workflows/tx-bulid.yml +++ b/.github/workflows/tx-bulid.yml @@ -27,19 +27,15 @@ jobs: with: node-version: ${{ matrix.node-version }} - uses: actions/checkout@v1 + - run: npx lerna bootstrap --scope ethereumjs-tx --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-tx --include-dependencies build + - run: npx lerna run build --scope ethereumjs-tx --include-dependencies - run: npx lerna run lint --scope ethereumjs-tx - - run: npm run test:node - working-directory: ${{ env.cwd }} - - run: npm run test:browser - working-directory: ${{ env.cwd }} - - run: npm run coverage - working-directory: ${{ env.cwd }} - if: ${{ matrix.node-version == 12 + - run: npx lerna run coverage --scope ethereumjs-tx + - uses: codecov/codecov-action@v1 with: file: ${{ env.cwd }}/coverage/lcov.info flags: tx - if: ${{ matrix.node-version == 12 + if: ${{ matrix.node-version == 12 }} diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml index 9a19fcbabef..ecd417f69f1 100644 --- a/.github/workflows/vm-build.yml +++ b/.github/workflows/vm-build.yml @@ -30,12 +30,10 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies - run: npx lerna run lint --scope ethereumjs-vm - - run: npm run test:API - working-directory: ${{ env.cwd }} - - run: npm run test:API:browser - working-directory: ${{ env.cwd }} + - run: npx lerna run test:API --scope ethereumjs-vm + - run: npx lerna run test:API:browser --scope ethereumjs-vm test-vm-state: runs-on: ubuntu-latest env: @@ -46,11 +44,9 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: npm run test:state:selectedForks - working-directory: ${{ env.cwd }} - - run: npm run coverage - working-directory: ${{ env.cwd }} + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies + - run: npx lerna run test:state:selectedForks --scope ethereumjs-vm + - run: npx lerna run coverage --scope ethereumjs-vm - uses: codecov/codecov-action@v1 with: file: ${{ env.cwd }}/coverage/lcov.info @@ -65,6 +61,5 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: npm run test:blockchain - working-directory: ${{ env.cwd }} + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies + - run: npx lerna run test:blockchain --scope ethereumjs-vm diff --git a/.github/workflows/vm-nightly-test.yml b/.github/workflows/vm-nightly-test.yml index 64756620fa6..69dbcf510cb 100644 --- a/.github/workflows/vm-nightly-test.yml +++ b/.github/workflows/vm-nightly-test.yml @@ -13,11 +13,9 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: npm run test:API - working-directory: ${{ env.cwd }} - - run: npm run test:API:browser - working-directory: ${{ env.cwd }} + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies + - run: npx lerna run test:API --scope ethereumjs-vm + - run: npx lerna run test:API:browser --scope ethereumjs-vm test-vm-state: runs-on: ubuntu-latest env: @@ -28,9 +26,8 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: npm run test:state:allForks - working-directory: ${{ env.cwd }} + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies + - run: npx lerna run test:state:allForks --scope ethereumjs-vm test-vm-blockchain: runs-on: ubuntu-latest env: @@ -41,9 +38,8 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: npm run test:blockchain - working-directory: ${{ env.cwd }} + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies + - run: npx lerna run test:blockchain --scope ethereumjs-vm test-vm-slow: runs-on: ubuntu-latest env: @@ -54,6 +50,5 @@ jobs: node-version: 12.x - uses: actions/checkout@v1 - run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci - - run: npx lerna run --scope ethereumjs-vm --include-dependencies build - - run: npm run test:state:slow - working-directory: ${{ env.cwd }} + - run: npx lerna run build --scope ethereumjs-vm --include-dependencies + - run: npx lerna run test:state:slow --scope ethereumjs-vm diff --git a/packages/account/.eslintrc.js b/packages/account/.eslintrc.js deleted file mode 100644 index 7b3e9dd5436..00000000000 --- a/packages/account/.eslintrc.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - extends: '@ethereumjs/eslint-config-helper', - parserOptions: { - project: './tsconfig.eslint.json', - }, -} diff --git a/packages/account/tsconfig.eslint.json b/packages/account/tsconfig.eslint.json deleted file mode 100644 index 1fc6fca730b..00000000000 --- a/packages/account/tsconfig.eslint.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts", ".eslintrc.js", "prettier.config.js", "typedoc.js"] -} diff --git a/packages/tx/package.json b/packages/tx/package.json index b8c7aae6323..5f5f6803b64 100644 --- a/packages/tx/package.json +++ b/packages/tx/package.json @@ -19,7 +19,7 @@ "tsc": "ethereumjs-config-tsc", "lint": "ethereumjs-config-lint", "lint:fix": "ethereumjs-config-lint-fix", - "test": "npm run test:node", + "test": "npm run test:node && npm run test:browser", "test:node": "ts-node node_modules/tape/bin/tape ./test/index.ts", "test:browser:build": "tsc && cp ./test/*.json test-build/test/", "test:browser": "npm run test:browser:build && karma start karma.conf.js" diff --git a/packages/vm/.eslintrc.js b/packages/vm/.eslintrc.js deleted file mode 100644 index 5ba1febf339..00000000000 --- a/packages/vm/.eslintrc.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - // extends: "@ethereumjs/config-lint", - parserOptions: { - project: './tsconfig.json', - } -}; \ No newline at end of file From 9e6a086ce3dae793fe0de7fa81fad9b443350071 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 1 Jun 2020 17:27:06 -0400 Subject: [PATCH 10/11] fix: renaming file with typo --- .github/workflows/{tx-bulid.yml => tx-build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{tx-bulid.yml => tx-build.yml} (100%) diff --git a/.github/workflows/tx-bulid.yml b/.github/workflows/tx-build.yml similarity index 100% rename from .github/workflows/tx-bulid.yml rename to .github/workflows/tx-build.yml From adaa27dedfda340e0289ddd1e9082cea9b697b2c Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 1 Jun 2020 17:58:53 -0400 Subject: [PATCH 11/11] ci: enabling all jobs to run for all pushes --- .github/workflows/account-build.yml | 10 ---------- .github/workflows/block-build.yml | 8 -------- .github/workflows/blockchain-build.yml | 10 ---------- .github/workflows/common-build.yml | 4 ---- .github/workflows/tx-build.yml | 6 ------ .github/workflows/vm-build.yml | 12 ------------ 6 files changed, 50 deletions(-) diff --git a/.github/workflows/account-build.yml b/.github/workflows/account-build.yml index 01d4bfe63da..90bfec6a4b1 100644 --- a/.github/workflows/account-build.yml +++ b/.github/workflows/account-build.yml @@ -5,18 +5,8 @@ on: - master tags: - '*' - paths-ignore: - - packages/block/** - - packages/blockchain/** - - packages/common/** - - packages/tx/** pull_request: types: [opened, reopened, synchronize] - paths-ignore: - - packages/block/** - - packages/blockchain/** - - packages/common/** - - packages/tx/** jobs: test-account: runs-on: ubuntu-latest diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml index 7fd88c65b8e..cc8bdb279e6 100644 --- a/.github/workflows/block-build.yml +++ b/.github/workflows/block-build.yml @@ -5,16 +5,8 @@ on: - master tags: - '*' - paths-ignore: - - packages/account/** - - packages/common/** - - packages/tx/** pull_request: types: [opened, reopened, synchronize] - paths-ignore: - - packages/account/** - - packages/common/** - - packages/tx/** jobs: test-block: runs-on: ubuntu-latest diff --git a/.github/workflows/blockchain-build.yml b/.github/workflows/blockchain-build.yml index ef08066da8e..97059b78f5e 100644 --- a/.github/workflows/blockchain-build.yml +++ b/.github/workflows/blockchain-build.yml @@ -5,18 +5,8 @@ on: - master tags: - '*' - paths-ignore: - - packages/account/** - - packages/block/** - - packages/common/** - - packages/tx/** pull_request: types: [opened, reopened, synchronize] - paths-ignore: - - packages/account/** - - packages/block/** - - packages/common/** - - packages/tx/** jobs: test-blockchain: runs-on: ubuntu-latest diff --git a/.github/workflows/common-build.yml b/.github/workflows/common-build.yml index 9c3950b5039..c479725df08 100644 --- a/.github/workflows/common-build.yml +++ b/.github/workflows/common-build.yml @@ -5,12 +5,8 @@ on: - master tags: - '*' - paths-ignore: - - packages/account/** pull_request: types: [opened, reopened, synchronize] - paths-ignore: - - packages/account/** jobs: test-common: runs-on: ubuntu-latest diff --git a/.github/workflows/tx-build.yml b/.github/workflows/tx-build.yml index 9e7dc20055d..ae72ac7e23b 100644 --- a/.github/workflows/tx-build.yml +++ b/.github/workflows/tx-build.yml @@ -5,14 +5,8 @@ on: - master tags: - '*' - paths-ignore: - - packages/account/** - - packages/common/** pull_request: types: [opened, reopened, synchronize] - paths-ignore: - - packages/account/** - - packages/common/** jobs: test-tx: runs-on: ubuntu-latest diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml index ecd417f69f1..3dfc98a1f7e 100644 --- a/.github/workflows/vm-build.yml +++ b/.github/workflows/vm-build.yml @@ -5,20 +5,8 @@ on: - master tags: - '*' - paths-ignore: - - packages/account/** - - packages/block/** - - packages/blockchain/** - - packages/common/** - - packages/tx/** pull_request: types: [opened, reopened, synchronize] - paths-ignore: - - packages/account/** - - packages/block/** - - packages/blockchain/** - - packages/common/** - - packages/tx/** jobs: test-vm-api: runs-on: ubuntu-latest