Skip to content

Commit

Permalink
fix: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
amina-deriv committed Jun 14, 2023
2 parents 9ef52cb + 57007f3 commit 73c29e3
Show file tree
Hide file tree
Showing 323 changed files with 28,853 additions and 73,957 deletions.
19 changes: 13 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ commands:
- "packages/stores/node_modules"
- "packages/trader/node_modules"
- "packages/translations/node_modules"
- "packages/utils/node_modules"
# VERIFY_CACHE_FOLDERS_END (DO NOT REMOVE)

build:
Expand Down Expand Up @@ -178,7 +179,7 @@ commands:
jobs:
build:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: xlarge
steps:
- git_checkout_from_cache
Expand All @@ -187,7 +188,7 @@ jobs:

release_staging:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: xlarge
steps:
- git_checkout_from_cache
Expand All @@ -207,7 +208,7 @@ jobs:

release_production:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: xlarge
steps:
- git_checkout_from_cache
Expand All @@ -229,7 +230,7 @@ jobs:

publish_cloudflare_staging:
docker:
- image: circleci/node:16.13.1-stretch
- image: cimg/node:18.16.0
steps:
- attach_workspace:
at: packages
Expand All @@ -239,7 +240,7 @@ jobs:

publish_cloudflare_production:
docker:
- image: circleci/node:16.13.1-stretch
- image: cimg/node:18.16.0
steps:
- attach_workspace:
at: packages
Expand All @@ -249,7 +250,7 @@ jobs:

build_and_test:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: xlarge
steps:
- git_checkout_from_cache
Expand All @@ -260,6 +261,9 @@ jobs:
- run:
name: "Check TypeScript for @deriv/hooks"
command: npx tsc --project packages/hooks/tsconfig.json -noEmit
- run:
name: "Check TypeScript for @deriv/utils"
command: npx tsc --project packages/utils/tsconfig.json -noEmit
- run:
name: "Check TypeScript for @deriv/stores"
command: npx tsc --project packages/stores/tsconfig.json -noEmit
Expand All @@ -269,6 +273,9 @@ jobs:
- run:
name: "Check tests for @deriv/hooks"
command: bash ./scripts/check-tests.sh packages/hooks/src
- run:
name: "Check tests for @deriv/utils"
command: bash ./scripts/check-tests.sh packages/utils/src
- build
- run:
name: "Run tests"
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 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 18.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: "16"
node-version: "18"
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 @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
steps:
- name: Setup node
uses: actions/setup-node@v2
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

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%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/)
![CircleCI](https://img.shields.io/circleci/build/github/binary-com/deriv-app) ![Prerequisite](https://img.shields.io/badge/node-18.x-blue.svg) ![Prerequisite](https://img.shields.io/badge/npm-9.x-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
2 changes: 1 addition & 1 deletion end-to-end-test/.github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- name: Install dependencies
run: npm ci
- name: Install Playwright Browsers
Expand Down
Loading

0 comments on commit 73c29e3

Please sign in to comment.