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

Commit

Permalink
Merge pull request #903 from EOSIO/merging_master
Browse files Browse the repository at this point in the history
Merging master into release/21.0.x
  • Loading branch information
Brad Hart authored Apr 19, 2021
2 parents 53b0962 + e71aab6 commit b4a96c4
Show file tree
Hide file tree
Showing 10 changed files with 273 additions and 63 deletions.
44 changes: 44 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "master"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "develop"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "release/21.0.x"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "release/22.0.x"

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
target-branch: "develop"

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
target-branch: "release/21.0.x"

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
target-branch: "release/22.0.x"
35 changes: 35 additions & 0 deletions .github/workflows/build-docker-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Build Docker - Develop
on:
schedule:
- cron: "0 2 * * *"

jobs:
build-docker:
name: Build Docker - Develop
runs-on: ubuntu-18.04
steps:
- name: Checkout
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: develop
token: ${{ github.token }}
- name: Set up QEMU
uses: docker/setup-qemu-action@6520a2d2cb6db42c90c297c8025839c98e531268
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@2a4b53665e15ce7d7049afb11ff1f70ff1610609
- name: Login to DockerHub
uses: docker/login-action@f3364599c6aa293cdc2b8391b1b56d0c30e45c8a
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f
with:
context: ./.github/eosjs-ci
file: ./.github/eosjs-ci/Dockerfile
pull: true
push: true
no-cache: true
tags: |
eosio/eosjs-ci:develop
eosio/eosjs-ci:${{ github.sha }}
38 changes: 38 additions & 0 deletions .github/workflows/build-docker-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build Docker - Release
on:
schedule:
- cron: "0 2 * * *"

jobs:
build-docker:
name: Build Docker - Release
runs-on: ubuntu-18.04
steps:
- name: Checkout
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: release/22.0.x
token: ${{ github.token }}
- name: Set up QEMU
uses: docker/setup-qemu-action@6520a2d2cb6db42c90c297c8025839c98e531268
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@2a4b53665e15ce7d7049afb11ff1f70ff1610609
- name: Login to DockerHub
uses: docker/login-action@f3364599c6aa293cdc2b8391b1b56d0c30e45c8a
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f
with:
context: ./.github/eosjs-ci
file: ./.github/eosjs-ci/Dockerfile
pull: true
push: true
no-cache: true
build-args: |
EOSBRANCH=release_2.1.x
CDTBRANCH=release_1.8.x
tags: |
eosio/eosjs-ci:release_22.0.x
eosio/eosjs-ci:${{ github.sha }}
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ jobs:
HAS_SECRET: ${{ secrets.GIT_API_KEY != null }}
- name: Checkout (with GIT_API_KEY)
if: ${{ steps.check_token.outputs.token_exists == 'true' }}
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
token: ${{ secrets.GIT_API_KEY }}
- name: Checkout (with GitHub Token)
if: ${{ steps.check_token.outputs.token_exists == 'false' }}
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
token: ${{ github.token }}
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
Expand All @@ -55,7 +55,7 @@ jobs:
run: |
yarn build-web
- name: Test Web
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
with:
spec: cypress/integration/index.spec.js
- name: Get Protected Status
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/integration-test-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Integration Test - Develop
on:
schedule:
- cron: "0 3 * * *"

jobs:
integration-test:
name: Integration Test - Develop
runs-on: ubuntu-18.04
strategy:
matrix:
node-version: [12.14.1]
steps:
- name: Checkout
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: develop
token: ${{ github.token }}
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- name: Install
run: |
yarn --frozen-lockfile
- name: Test
run: |
yarn test
- name: Test Node
run: |
yarn test-node
- name: Test Types
run: |
yarn test-types
- name: Build
run: |
yarn build-web
- name: Test Web
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
with:
spec: cypress/integration/index.spec.js
services:
nodeos:
image: eosio/eosjs-ci:develop

ports:
- 8888:8888
- 9876:9876
49 changes: 49 additions & 0 deletions .github/workflows/integration-test-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Integration Test - Release
on:
schedule:
- cron: "0 3 * * *"

jobs:
integration-test:
name: Integration Test - Release
runs-on: ubuntu-18.04
strategy:
matrix:
node-version: [12.14.1]
steps:
- name: Checkout
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: release/22.0.x
token: ${{ github.token }}
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- name: Install
run: |
yarn --frozen-lockfile
- name: Test
run: |
yarn test
- name: Test Node
run: |
yarn test-node
- name: Test Types
run: |
yarn test-types
- name: Build
run: |
yarn build-web
- name: Test Web
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
with:
spec: cypress/integration/index.spec.js
services:
nodeos:
image: eosio/eosjs-ci:release_22.0.x

ports:
- 8888:8888
- 9876:9876
6 changes: 3 additions & 3 deletions .github/workflows/publish-edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
node-version: [12.14.1]
steps:
- name: Checkout
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
Expand All @@ -35,7 +35,7 @@ jobs:
run: |
yarn build-web
- name: Test Web
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
with:
spec: cypress/integration/index.spec.js
- name: Publish Edge
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
node-version: [12.14.1]
steps:
- name: Checkout
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
Expand All @@ -35,7 +35,7 @@ jobs:
run: |
yarn build-web
- name: Test Web
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
with:
spec: cypress/integration/index.spec.js
- name: Publish Release
Expand Down Expand Up @@ -66,9 +66,9 @@ jobs:
node-version: [12.14.1]
steps:
- name: Checkout
uses: actions/checkout@f90c7b395dac7c5a277c1a6d93d5057c1cddb74e
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
Expand All @@ -88,7 +88,7 @@ jobs:
run: |
yarn build-web
- name: Test Web
uses: cypress-io/github-action@6e9b583c9652e99b72b042a3957980fc6166efae
uses: cypress-io/github-action@89161930792c0050baeba2737caa058c395ecfcb
with:
spec: cypress/integration/index.spec.js
- name: Publish RC
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
"@blockone/eslint-config-blockone": "^4.0.0",
"@types/elliptic": "^6.4.12",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.37",
"@types/node": "^14.14.41",
"@types/pako": "^1.0.1",
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
"cypress": "^7.0.1",
"cypress": "^7.1.0",
"eosjs-ecc": "^4.0.7",
"eslint": "^7.24.0",
"jest": "^26.6.3",
"jest-fetch-mock": "^3.0.3",
"ts-jest": "^26.5.4",
"ts-jest": "^26.5.5",
"ts-loader": "^8.1.0",
"typescript": "^4.2.4",
"webpack": "^5.32.0",
"webpack": "^5.34.0",
"webpack-cli": "^4.6.0"
},
"jest": {
Expand Down
Loading

0 comments on commit b4a96c4

Please sign in to comment.