Skip to content

Commit

Permalink
chore: merge develop into main (#143)
Browse files Browse the repository at this point in the history
  • Loading branch information
@goga-m
goga-m authored Aug 31, 2022
2 parents 11fcdcb + 3e8160b commit 0ff226a
Show file tree
Hide file tree
Showing 213 changed files with 14,357 additions and 7,763 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ module.exports = {
"jest/no-conditional-expect": "off",
"jest/no-done-callback": "off",
"jest/no-identical-title": "error",
"jest/no-standalone-expect": ["error", { additionalTestBlockFunctions: ["itif"] }],
"jest/no-test-return-statement": "error",
"jest/prefer-called-with": "error",
"jest/prefer-expect-resolves": "error",
Expand All @@ -112,7 +113,7 @@ module.exports = {
"jest/prefer-to-contain": "error",
"jest/prefer-to-have-length": "error",
"jest/prefer-todo": "error",
"jest/require-hook": "error",
"jest/require-hook": ["error", { allowedFunctionCalls: ["itif"] }],
"jest/require-to-throw-message": "error",
"jest/require-top-level-describe": "error",
"jest/valid-expect": "error",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down
87 changes: 78 additions & 9 deletions .github/workflows/e2e.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -349,7 +349,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -398,6 +398,75 @@ jobs:
name: ${{ github.job }}-screenshots
path: ${{ github.workspace }}/screenshots/**/*

e2e-message:
needs: build-and-upload

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.9.1]

concurrency:
group: ${{ github.head_ref }}-e2e-message
cancel-in-progress: true

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}

- uses: pnpm/action-setup@v2
with:
version: 7

- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: pnpm

- name: Update System
run: sudo apt-get update

- name: Install (Ledger Requirements)
run: sudo apt-get install libudev-dev libusb-1.0-0-dev

- name: Install (pnpm)
run: pnpm install --frozen-lockfile

- name: Set up Microsoft Edge
run: |
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
sudo install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d/
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list'
sudo apt update
sudo apt install microsoft-edge-beta
- name: Download Build Artifact
uses: actions/download-artifact@v2
with:
name: dist
path: ${{ github.workspace }}/dist

- name: Start Server
run: pnpm serve &

- name: Chromium
run: pnpm test:e2e:ci src/domains/message/cucumber

- name: Firefox
run: pnpm test:e2e:ci:firefox src/domains/message/cucumber

- name: Edge
run: pnpm test:e2e:ci:edge src/domains/message/cucumber

- name: Upload Screenshots
if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: ${{ github.job }}-screenshots
path: ${{ github.workspace }}/screenshots/**/*

e2e-news:
needs: build-and-upload

Expand All @@ -418,7 +487,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -487,7 +556,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -556,7 +625,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7

- uses: actions/setup-node@v2
with:
Expand Down
67 changes: 53 additions & 14 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -204,6 +204,45 @@ jobs:
--watchAll=false --coverage
--collectCoverageFrom='["src/domains/exchange/**/*.{js,jsx,ts,tsx}","!<rootDir>/build/*","!<rootDir>/dist/*","!jest.setup.js","!src/**/e2e/*.ts","!src/**/cucumber/*.ts","!src/**/*.e2e.ts","!src/**/*.models.{js,jsx,ts,tsx}","!src/**/*.stories.{js,jsx,ts,tsx}","!src/**/*.styles.{js,jsx,ts,tsx}","!src/i18n/**/*","!src/tests/**/*","!src/tailwind.config.js","!src/utils/e2e-utils.ts","!src/polyfill/**/*"]'
--coverageThreshold='{"./src/domains/exchange/":{"branches":100,"functions":100,"lines":100,"statements":100}}'
domains-message:
runs-on: ubuntu-latest
strategy:
matrix:
node-version:
- 16.9.1
concurrency:
group: ${{ github.head_ref }}-test-domains-message
cancel-in-progress: true
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: pnpm
- name: Update System
run: sudo apt-get update
- name: Install (Ledger Requirements)
run: sudo apt-get install libudev-dev libusb-1.0-0-dev
- name: Install (pnpm)
run: pnpm install --frozen-lockfile
- name: Rebuild
run: pnpm rebuild
- name: Test
uses: nick-invision/retry@v2
with:
timeout_minutes: 10
max_attempts: 1
command: node --expose-gc ./node_modules/jest/bin/jest.js
src/domains/message --env=./src/tests/custom-env.js
--forceExit --maxWorkers=50% --logHeapUsage
--watchAll=false --coverage
--collectCoverageFrom='["src/domains/message/**/*.{js,jsx,ts,tsx}","!<rootDir>/build/*","!<rootDir>/dist/*","!jest.setup.js","!src/**/e2e/*.ts","!src/**/cucumber/*.ts","!src/**/*.e2e.ts","!src/**/*.models.{js,jsx,ts,tsx}","!src/**/*.stories.{js,jsx,ts,tsx}","!src/**/*.styles.{js,jsx,ts,tsx}","!src/i18n/**/*","!src/tests/**/*","!src/tailwind.config.js","!src/utils/e2e-utils.ts","!src/polyfill/**/*"]'
--coverageThreshold='{"./src/domains/message/":{"branches":100,"functions":100,"lines":100,"statements":100}}'
domains-network:
runs-on: ubuntu-latest
strategy:
Expand All @@ -219,7 +258,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -258,7 +297,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -297,7 +336,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -336,7 +375,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -375,7 +414,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -414,7 +453,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -453,7 +492,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -492,7 +531,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -531,7 +570,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
with:
version: 6.24.4
version: 7
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
Expand Down
Loading

1 comment on commit 0ff226a

@vercel
Copy link

@vercel vercel bot commented on 0ff226a Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

arkvault – ./

app.arkvault.io
arkvault-ardent.vercel.app
app.payvo.com
arkvault-git-main-ardent.vercel.app
beta.payvo.com

Please sign in to comment.