Skip to content

Commit

Permalink
Merge branch 'master' into ci/vm-tests-on-demand
Browse files Browse the repository at this point in the history
  • Loading branch information
holgerd77 authored Nov 16, 2020
2 parents c13ce86 + 9b86316 commit 16274c4
Show file tree
Hide file tree
Showing 26 changed files with 418 additions and 79 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/block-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/blockchain-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/common-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ethash-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
66 changes: 66 additions & 0 deletions .github/workflows/node-versions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#
# This special file aims to run node tests for each relevant node version.
# A relevant node version can be: active, current, maintenance or EOL with some months of tolerance
# For more details, please check ./scripts/node-versions.js
#

name: Node versions
on:
schedule:
- cron: 0 0 * * *

jobs:
get-node-versions:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

- uses: actions/checkout@v2

- id: set-matrix
run: echo "::set-output name=matrix::$(npx testable-node-versions)"

tests:
needs: get-node-versions
runs-on: ubuntu-latest
strategy:
matrix:
node: ${{ fromJson(needs.get-node-versions.outputs.matrix) }}
steps:
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

- uses: actions/checkout@v2

- run: npm install
- run: npm run build

- name: Test Block
run: npm run test
working-directory: packages/block

- name: Test Blockchain
run: npm run test
working-directory: packages/blockchain

- name: Test Common
run: npm run test
working-directory: packages/common

- name: Test Ethash
run: npm run test
working-directory: packages/ethash

- name: Test Tx
run: npm run test
working-directory: packages/tx

- name: Test VM
run: npm run test:API
working-directory: packages/vm

4 changes: 3 additions & 1 deletion .github/workflows/tx-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/vm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down Expand Up @@ -56,7 +58,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand All @@ -83,7 +87,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down Expand Up @@ -111,6 +117,8 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/vm-nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

# This is specific to Nightly test 1/2.
# The job needs to run with a fresh combination of lockfiles, to warm up the cache.
Expand All @@ -42,7 +44,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

# This is specific to Nightly test 1/2.
# The job needs to run with a fresh combination of lockfiles, to warm up the cache.
Expand All @@ -66,7 +70,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

# This is specific to Nightly test 1/2.
# The job needs to run with a fresh combination of lockfiles, to warm up the cache.
Expand Down Expand Up @@ -101,7 +107,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

# This is specific to Nightly test 1/2.
# The job needs to run with a fresh combination of lockfiles, to warm up the cache.
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/vm-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down Expand Up @@ -60,7 +62,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down Expand Up @@ -183,7 +187,9 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down Expand Up @@ -211,6 +217,8 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Dependency cache
uses: actions/cache@v2
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "ethereum-tests"]
path = ethereum-tests
url = https://github.com/ethereum/tests.git
branch = develop
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ https://mermaid-js.github.io/mermaid-live-editor/#/edit/eyJjb2RlIjoiZ3JhcGggVERc

## Development quick start

First, make sure you have the `ethereum-tests` git submodule, by running:

```sh
git submodule init
git submodule update
```

This monorepo uses [Lerna](https://lerna.js.org/). It links the local packages together, making development a lot easier.

TLDR: Setup
Expand Down
1 change: 1 addition & 0 deletions ethereum-tests
Submodule ethereum-tests added at bfcd07
29 changes: 27 additions & 2 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions packages/block/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# ethereumjs-block
# @ethereumjs/block

[![NPM Package][block-npm-badge]][block-npm-link]
[![GitHub Issues][block-issues-badge]][block-issues-link]
[![Actions Status][block-actions-badge]][block-actions-link]
[![Code Coverage][block-coverage-badge]][block-coverage-link]
[![Discord][discord-badge]][discord-link]

Implements schema and functions related to Ethereum's block.
| Implements schema and functions related to Ethereum's block. |
| --- |

Note: this `README` reflects the state of the library from `v3.0.0` onwards. See `README` from the [standalone repository](https://github.com/ethereumjs/ethereumjs-block) for an introduction on the last preceeding release.

Expand Down
5 changes: 3 additions & 2 deletions packages/blockchain/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# ethereumjs-blockchain
# @ethereumjs/blockchain

[![NPM Package][blockchain-npm-badge]][blockchain-npm-link]
[![GitHub Issues][blockchain-issues-badge]][blockchain-issues-link]
[![Actions Status][blockchain-actions-badge]][blockchain-actions-link]
[![Code Coverage][blockchain-coverage-badge]][blockchain-coverage-link]
[![Discord][discord-badge]][discord-link]

A module to store and interact with blocks.
| A module to store and interact with blocks. |
| --- |

Note: this `README` reflects the state of the library from `v5.0.0` onwards. See `README` from the [standalone repository](https://github.com/ethereumjs/ethereumjs-blockchain) for an introduction on the last preceeding release.

Expand Down
Loading

0 comments on commit 16274c4

Please sign in to comment.