Skip to content

Commit

Permalink
Merge branch 'master' into 73888_Transfer-button-is-enabled-without-e…
Browse files Browse the repository at this point in the history
…ntering-transfer-amount
  • Loading branch information
heorhi-deriv authored Sep 1, 2022
2 parents 493c6d0 + 1b672e8 commit 996ce3f
Show file tree
Hide file tree
Showing 217 changed files with 46,480 additions and 41,682 deletions.
16 changes: 9 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,10 @@ commands:
- run:
name: Pushing Image to docker hub
command: |
TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
docker push ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>
docker push ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:<< parameters.docker_image_latest_tag >>
docker push ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:${TAG}
k8s_deploy:
description: "Deploy to k8s cluster"
parameters:
Expand Down Expand Up @@ -184,15 +185,15 @@ commands:
jobs:
build:
docker:
- image: circleci/node:14.17.1-stretch
- image: cimg/node:16.16.0
steps:
- git_checkout_from_cache
- npm_install_from_cache
- build

release_storybook:
docker:
- image: circleci/node:14.17.1-stretch
- image: cimg/node:16.16.0
steps:
- git_checkout_from_cache
- npm_install_from_cache
Expand All @@ -212,7 +213,7 @@ jobs:

release_staging:
docker:
- image: circleci/node:14.17.1-stretch
- image: cimg/node:16.16.0
steps:
- git_checkout_from_cache
- npm_install_from_cache
Expand All @@ -231,7 +232,7 @@ jobs:

release_production:
docker:
- image: circleci/node:14.17.1-stretch
- image: cimg/node:16.16.0
steps:
- git_checkout_from_cache
- npm_install_from_cache
Expand Down Expand Up @@ -272,7 +273,7 @@ jobs:

build_and_test:
docker:
- image: circleci/node:14.17.1-stretch
- image: cimg/node:16.16.0
steps:
- git_checkout_from_cache
- npm_install_from_cache
Expand Down Expand Up @@ -337,3 +338,4 @@ workflows:
- gh-pages
tags:
ignore: /.*/

6 changes: 6 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ module.exports = {
react: {
version: 'detect',
},
'import/resolver': {
node: {
extensions: ['.ts', '.tsx'],
moduleDirectory: ['src', 'node_modules'],
},
},
},
},
],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Use Node.js 14.x
- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x
- name: install, bootstrap and make test coverage
run: |
npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_and_push_deriv_api_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
id: step1
uses: actions/setup-node@v2
with:
node-version: "14"
node-version: "16"
check-latest: true
registry-url: "https://registry.npmjs.org"
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push_and_pull_crowdin_translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [16.x]
steps:
- name: Setup node
uses: actions/setup-node@v2
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
packages/components/stories/icon/icons.js
*.yml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This repository contains the various platforms of the Deriv application.

![CircleCI](https://img.shields.io/circleci/build/github/binary-com/deriv-app) ![Prerequisite](https://img.shields.io/badge/node-%3E%3D14.17.1-blue.svg) ![Prerequisite](https://img.shields.io/badge/npm-%3E%3D7.21.0-blue.svg) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
![CircleCI](https://img.shields.io/circleci/build/github/binary-com/deriv-app) ![Prerequisite](https://img.shields.io/badge/node-%3E%3D16.16.0-blue.svg) ![Prerequisite](https://img.shields.io/badge/npm-%3E%3D7.21.0-blue.svg) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
![Sonar Tech Debt](https://img.shields.io/sonar/tech_debt/binary-com_deriv-app?server=https%3A%2F%2Fsonarcloud.io)
![Sonar Violations (short format)](https://img.shields.io/sonar/violations/binary-com_deriv-app?server=https%3A%2F%2Fsonarcloud.io)
[![codecov](https://codecov.io/gh/binary-com/deriv-app/branch/dev/graph/badge.svg?token=LClg2rlZ4z)](https://codecov.io/gh/binary-com/deriv-app)
Expand Down Expand Up @@ -38,7 +38,7 @@ This repository contains the various platforms of the Deriv application.

Before running or contribute to this project, you need to have the setup of the following package in your environment.

- node >=14.17.1
- node >=16.16.0
- npm >=7.21.0
- git (for `contribution`)

Expand Down
2 changes: 1 addition & 1 deletion e2e_tests/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# End to end testing

[Prerequisite](https://img.shields.io/badge/node-%3E%3D14.15.4-blue.svg)
[Prerequisite](https://img.shields.io/badge/node-%3E%3D16.16.0-blue.svg)

**In this document:**

Expand Down
Loading

0 comments on commit 996ce3f

Please sign in to comment.