Skip to content

Commit

Permalink
Replace ethereumjs-util with @ethereumjs/util (#6283)
Browse files Browse the repository at this point in the history
* replace module

* add change log

* add zlib

* add ethereum-cryptography

* remove 14 node from test

* add timeout

* node 18

* revert

* node 16

* test

* trying clean up before run

* 16

* stop

* fix kill ganache

* firefox update

* fix mosaic

* fix

* only mosaic

* add links to 1.x version

* win test

* fix all

* try win on ubuntu

* add iltorb

* only windows

* off verdaccio_pid

* all tests

* win to ubuntu

* only windows

* all

* needs e2e

* without needs for win test

* win needs e2e

---------

Co-authored-by: Your Name <you@example.com>
  • Loading branch information
avkos and Your Name committed Jul 25, 2023
1 parent e68194b commit 5f02175
Show file tree
Hide file tree
Showing 17 changed files with 34,956 additions and 32,440 deletions.
31 changes: 16 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- uses: actions/checkout@v2

- uses: actions/cache@v2
Expand All @@ -35,7 +35,7 @@ jobs:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-node14-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node16-${{ hashFiles('**/package-lock.json') }}

- run: npm ci
if: steps.cache-deps.outputs.cache-hit != 'true'
Expand All @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16, 18]
node: [16, 18]
env:
TEST: "unit"
steps:
Expand Down Expand Up @@ -73,20 +73,20 @@ jobs:
fail-fast: false
matrix:
testCmd:
[
'unit_and_e2e_clients',
'e2e_browsers',
'e2e_ganache',
'e2e_mosaic',
#'e2e_gnosis_dex',
]
[
'unit_and_e2e_clients',
'e2e_browsers',
'e2e_ganache',
'e2e_mosaic',
#'e2e_gnosis_dex',
]
env:
TEST: ${{ matrix.testCmd }}
INFURA_HTTP: ${{ secrets.INFURA_HTTP }}
steps:
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- uses: actions/checkout@v2
- uses: browser-actions/setup-firefox@latest
if: matrix.testCmd == 'e2e_browsers'
Expand All @@ -97,7 +97,7 @@ jobs:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-node14-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node16-${{ hashFiles('**/package-lock.json') }}

- run: npm ci
if: (env.TEST == 'unit_and_e2e_clients' || env.TEST == 'e2e_browsers') && steps.cache-deps.outputs.cache-hit != 'true'
Expand All @@ -110,6 +110,7 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
e2e_windows:
needs: e2e
runs-on: windows-latest
env:
TEST: "e2e_windows"
Expand All @@ -118,14 +119,14 @@ jobs:
steps:
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- uses: actions/checkout@v2
- run: bash ./scripts/ci.sh
eth2:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16, 18]
node: [16, 18]
env:
TEST: "eth2"
steps:
Expand All @@ -150,4 +151,4 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- run: 'echo "No build required"'
- run: 'echo "No build required"'
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -686,4 +686,7 @@ Released with 1.0.0-beta.37 code base.

- Builds fixed by updating all typescript versions to 4.9.5 (#6238)
- ABI encoding for large negative `int`s (#6239)
- Updated type file for `submitWork` parameters, accepts 3 parameters instead of an array (#5200)
- Updated type file for `submitWork` parameters, accepts 3 parameters instead of an array (#5200)

### Changed
- Replace ethereumjs-util with @ethereumjs/util (#6283)
Loading

0 comments on commit 5f02175

Please sign in to comment.