Skip to content

Commit

Permalink
Merge branch 'master' into eip-2315
Browse files Browse the repository at this point in the history
  • Loading branch information
cgewecke authored Jun 2, 2020
2 parents eb77f6a + a818c84 commit 3b1a750
Show file tree
Hide file tree
Showing 25 changed files with 210 additions and 272 deletions.
64 changes: 0 additions & 64 deletions .circleci/config.yml

This file was deleted.

35 changes: 15 additions & 20 deletions .github/workflows/account-build.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
name: Account
'on':
on:
push:
branches:
- 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
strategy:
matrix:
node-version: [10.x, 12.x, 13.x, 14.x]
node-version: [10, 12, 13, 14]
env:
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
env:
CI: true
working-directory: '${{ env.cwd }}'
env:
cwd: '${{github.workspace}}/packages/account'

- run: npx lerna run coverage --scope ethereumjs-account

- uses: codecov/codecov-action@v1
with:
file: ${{ env.cwd }}/coverage/lcov.info
flags: account
if: ${{ matrix.node-version == 12 }}
41 changes: 18 additions & 23 deletions .github/workflows/block-build.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,37 @@
name: Block
'on':
on:
push:
branches:
- 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
strategy:
matrix:
node-version: [10.x, 12.x, 13.x, 14.x]
node-version: [10, 12, 13, 14]
env:
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
env:
CI: true
working-directory: '${{ env.cwd }}'
- run: 'npm run test:browser'
env:
CI: true
working-directory: '${{ env.cwd }}'
env:
cwd: '${{github.workspace}}/packages/block'

- run: npm run coverage
working-directory: ${{ env.cwd }}

- uses: codecov/codecov-action@v1
with:
file: ${{ env.cwd }}/coverage/lcov.info
flags: block
if: ${{ matrix.node-version == 12 }}
37 changes: 16 additions & 21 deletions .github/workflows/blockchain-build.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
name: Blockchain
'on':
on:
push:
branches:
- 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
strategy:
matrix:
node-version: [10.x, 12.x, 13.x, 14.x]
node-version: [10, 12, 13, 14]
env:
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 build --scope ethereumjs-blockchain --include-dependencies
- run: npx lerna run lint --scope ethereumjs-blockchain
- run: npm test
env:
CI: true
working-directory: '${{ env.cwd }}'
env:
cwd: '${{github.workspace}}/packages/blockchain'

- 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 }}
31 changes: 16 additions & 15 deletions .github/workflows/common-build.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
name: Common
'on':
on:
push:
branches:
- master
tags:
- '*'
paths-ignore:
- packages/account/**
pull_request:
types: [opened, reopened, synchronize]
paths-ignore:
- packages/account/**
jobs:
test-common:
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
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 build --scope ethereumjs-common --include-dependencies
- run: npx lerna run lint --scope ethereumjs-common
- run: npm test
env:
CI: true
working-directory: '${{ env.cwd }}'
env:
cwd: '${{github.workspace}}/packages/common'

- 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 }}
35 changes: 35 additions & 0 deletions .github/workflows/tx-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Tx
on:
push:
branches:
- master
tags:
- '*'
pull_request:
types: [opened, reopened, synchronize]
jobs:
test-tx:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10, 12, 13, 14]
env:
cwd: ${{github.workspace}}/packages/tx
steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
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 build --scope ethereumjs-tx --include-dependencies
- run: npx lerna run lint --scope ethereumjs-tx

- 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 }}
40 changes: 0 additions & 40 deletions .github/workflows/tx-bulid.yml

This file was deleted.

Loading

0 comments on commit 3b1a750

Please sign in to comment.