Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit b4a96c4

Browse files
author
Brad Hart
authored
Merge pull request #903 from EOSIO/merging_master
Merging master into release/21.0.x
2 parents 53b0962 + e71aab6 commit b4a96c4

10 files changed

+273
-63
lines changed

‎.github/dependabot.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"
8+
target-branch: "master"
9+
10+
- package-ecosystem: "github-actions"
11+
directory: "/"
12+
schedule:
13+
interval: "daily"
14+
target-branch: "develop"
15+
16+
- package-ecosystem: "github-actions"
17+
directory: "/"
18+
schedule:
19+
interval: "daily"
20+
target-branch: "release/21.0.x"
21+
22+
- package-ecosystem: "github-actions"
23+
directory: "/"
24+
schedule:
25+
interval: "daily"
26+
target-branch: "release/22.0.x"
27+
28+
- package-ecosystem: "npm"
29+
directory: "/"
30+
schedule:
31+
interval: "daily"
32+
target-branch: "develop"
33+
34+
- package-ecosystem: "npm"
35+
directory: "/"
36+
schedule:
37+
interval: "daily"
38+
target-branch: "release/21.0.x"
39+
40+
- package-ecosystem: "npm"
41+
directory: "/"
42+
schedule:
43+
interval: "daily"
44+
target-branch: "release/22.0.x"

‎.github/workflows/build-docker-develop.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Build Docker - Develop
2+
on:
3+
schedule:
4+
- cron: "0 2 * * *"
5+
6+
jobs:
7+
build-docker:
8+
name: Build Docker - Develop
9+
runs-on: ubuntu-18.04
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
13+
with:
14+
ref: develop
15+
token: ${{ github.token }}
16+
- name: Set up QEMU
17+
uses: docker/setup-qemu-action@6520a2d2cb6db42c90c297c8025839c98e531268
18+
- name: Set up Docker Buildx
19+
uses: docker/setup-buildx-action@2a4b53665e15ce7d7049afb11ff1f70ff1610609
20+
- name: Login to DockerHub
21+
uses: docker/login-action@f3364599c6aa293cdc2b8391b1b56d0c30e45c8a
22+
with:
23+
username: ${{ secrets.DOCKERHUB_USERNAME }}
24+
password: ${{ secrets.DOCKERHUB_TOKEN }}
25+
- name: Build and push
26+
uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f
27+
with:
28+
context: ./.github/eosjs-ci
29+
file: ./.github/eosjs-ci/Dockerfile
30+
pull: true
31+
push: true
32+
no-cache: true
33+
tags: |
34+
eosio/eosjs-ci:develop
35+
eosio/eosjs-ci:${{ github.sha }}

‎.github/workflows/build-docker-release.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Build Docker - Release
2+
on:
3+
schedule:
4+
- cron: "0 2 * * *"
5+
6+
jobs:
7+
build-docker:
8+
name: Build Docker - Release
9+
runs-on: ubuntu-18.04
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
13+
with:
14+
ref: release/22.0.x
15+
token: ${{ github.token }}
16+
- name: Set up QEMU
17+
uses: docker/setup-qemu-action@6520a2d2cb6db42c90c297c8025839c98e531268
18+
- name: Set up Docker Buildx
19+
uses: docker/setup-buildx-action@2a4b53665e15ce7d7049afb11ff1f70ff1610609
20+
- name: Login to DockerHub
21+
uses: docker/login-action@f3364599c6aa293cdc2b8391b1b56d0c30e45c8a
22+
with:
23+
username: ${{ secrets.DOCKERHUB_USERNAME }}
24+
password: ${{ secrets.DOCKERHUB_TOKEN }}
25+
- name: Build and push
26+
uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f
27+
with:
28+
context: ./.github/eosjs-ci
29+
file: ./.github/eosjs-ci/Dockerfile
30+
pull: true
31+
push: true
32+
no-cache: true
33+
build-args: |
34+
EOSBRANCH=release_2.1.x
35+
CDTBRANCH=release_1.8.x
36+
tags: |
37+
eosio/eosjs-ci:release_22.0.x
38+
eosio/eosjs-ci:${{ github.sha }}

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
HAS_SECRET: ${{ secrets.GIT_API_KEY != null }}
2121
- name: Checkout (with GIT_API_KEY)
2222
if: ${{ steps.check_token.outputs.token_exists == 'true' }}
23-
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
23+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2424
with:
2525
token: ${{ secrets.GIT_API_KEY }}
2626
- name: Checkout (with GitHub Token)
2727
if: ${{ steps.check_token.outputs.token_exists == 'false' }}
28-
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
28+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2929
with:
3030
token: ${{ github.token }}
3131
- name: Setup Node.js ${{ matrix.node-version }}
32-
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
32+
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
3333
with:
3434
node-version: ${{ matrix.node-version }}
3535
registry-url: 'https://registry.npmjs.org'
@@ -55,7 +55,7 @@ jobs:
5555
run: |
5656
yarn build-web
5757
- name: Test Web
58-
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
58+
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
5959
with:
6060
spec: cypress/integration/index.spec.js
6161
- name: Get Protected Status

‎.github/workflows/integration-test-develop.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Integration Test - Develop
2+
on:
3+
schedule:
4+
- cron: "0 3 * * *"
5+
6+
jobs:
7+
integration-test:
8+
name: Integration Test - Develop
9+
runs-on: ubuntu-18.04
10+
strategy:
11+
matrix:
12+
node-version: [12.14.1]
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
16+
with:
17+
ref: develop
18+
token: ${{ github.token }}
19+
- name: Setup Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
registry-url: 'https://registry.npmjs.org'
24+
- name: Install
25+
run: |
26+
yarn --frozen-lockfile
27+
- name: Test
28+
run: |
29+
yarn test
30+
- name: Test Node
31+
run: |
32+
yarn test-node
33+
- name: Test Types
34+
run: |
35+
yarn test-types
36+
- name: Build
37+
run: |
38+
yarn build-web
39+
- name: Test Web
40+
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
41+
with:
42+
spec: cypress/integration/index.spec.js
43+
services:
44+
nodeos:
45+
image: eosio/eosjs-ci:develop
46+
47+
ports:
48+
- 8888:8888
49+
- 9876:9876

‎.github/workflows/integration-test-release.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Integration Test - Release
2+
on:
3+
schedule:
4+
- cron: "0 3 * * *"
5+
6+
jobs:
7+
integration-test:
8+
name: Integration Test - Release
9+
runs-on: ubuntu-18.04
10+
strategy:
11+
matrix:
12+
node-version: [12.14.1]
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
16+
with:
17+
ref: release/22.0.x
18+
token: ${{ github.token }}
19+
- name: Setup Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
registry-url: 'https://registry.npmjs.org'
24+
- name: Install
25+
run: |
26+
yarn --frozen-lockfile
27+
- name: Test
28+
run: |
29+
yarn test
30+
- name: Test Node
31+
run: |
32+
yarn test-node
33+
- name: Test Types
34+
run: |
35+
yarn test-types
36+
- name: Build
37+
run: |
38+
yarn build-web
39+
- name: Test Web
40+
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
41+
with:
42+
spec: cypress/integration/index.spec.js
43+
services:
44+
nodeos:
45+
image: eosio/eosjs-ci:release_22.0.x
46+
47+
ports:
48+
- 8888:8888
49+
- 9876:9876

‎.github/workflows/publish-edge.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
node-version: [12.14.1]
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
16+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
1717
- name: Setup Node.js ${{ matrix.node-version }}
18-
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
18+
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
1919
with:
2020
node-version: ${{ matrix.node-version }}
2121
registry-url: 'https://registry.npmjs.org'
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
yarn build-web
3737
- name: Test Web
38-
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
38+
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
3939
with:
4040
spec: cypress/integration/index.spec.js
4141
- name: Publish Edge

‎.github/workflows/publish-release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
node-version: [12.14.1]
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
16+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
1717
- name: Setup Node.js ${{ matrix.node-version }}
18-
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
18+
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
1919
with:
2020
node-version: ${{ matrix.node-version }}
2121
registry-url: 'https://registry.npmjs.org'
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
yarn build-web
3737
- name: Test Web
38-
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
38+
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
3939
with:
4040
spec: cypress/integration/index.spec.js
4141
- name: Publish Release
@@ -66,9 +66,9 @@ jobs:
6666
node-version: [12.14.1]
6767
steps:
6868
- name: Checkout
69-
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
69+
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
7070
- name: Setup Node.js ${{ matrix.node-version }}
71-
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
71+
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
7272
with:
7373
node-version: ${{ matrix.node-version }}
7474
registry-url: 'https://registry.npmjs.org'
@@ -88,7 +88,7 @@ jobs:
8888
run: |
8989
yarn build-web
9090
- name: Test Web
91-
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
91+
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
9292
with:
9393
spec: cypress/integration/index.spec.js
9494
- name: Publish RC

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@
3535
"@blockone/eslint-config-blockone": "^4.0.0",
3636
"@types/elliptic": "^6.4.12",
3737
"@types/jest": "^26.0.22",
38-
"@types/node": "^14.14.37",
38+
"@types/node": "^14.14.41",
3939
"@types/pako": "^1.0.1",
4040
"buffer": "^6.0.3",
4141
"crypto-browserify": "^3.12.0",
42-
"cypress": "^7.0.1",
42+
"cypress": "^7.1.0",
4343
"eosjs-ecc": "^4.0.7",
4444
"eslint": "^7.24.0",
4545
"jest": "^26.6.3",
4646
"jest-fetch-mock": "^3.0.3",
47-
"ts-jest": "^26.5.4",
47+
"ts-jest": "^26.5.5",
4848
"ts-loader": "^8.1.0",
4949
"typescript": "^4.2.4",
50-
"webpack": "^5.32.0",
50+
"webpack": "^5.34.0",
5151
"webpack-cli": "^4.6.0"
5252
},
5353
"jest": {

0 commit comments

Comments
 (0)