Skip to content

Commit

Permalink
Merge branch 'master' into 93000/fix_change_theme_translation_issue
Browse files Browse the repository at this point in the history
  • Loading branch information
hamid-deriv committed Jun 28, 2023
2 parents fe67853 + 06343ec commit 2ab1ebf
Show file tree
Hide file tree
Showing 1,983 changed files with 115,231 additions and 145,783 deletions.
38 changes: 32 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,15 +179,17 @@ commands:
jobs:
build:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: xlarge
steps:
- git_checkout_from_cache
- npm_install_from_cache
- build

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

release_production:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: xlarge
steps:
- git_checkout_from_cache
- npm_install_from_cache
Expand All @@ -226,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 @@ -236,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 @@ -246,10 +250,32 @@ jobs:

build_and_test:
docker:
- image: cimg/node:16.16.0
- image: cimg/node:18.16.0
resource_class: large
steps:
- git_checkout_from_cache
- npm_install_from_cache
- run:
name: "Check TypeScript for @deriv/api"
command: npx tsc --project packages/api/tsconfig.json -noEmit
- 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
# - run:
# name: "Check TypeScript for @deriv/cashier"
# command: npx tsc --project packages/cashier/tsconfig.json -noEmit
- 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
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ module.exports = {
'import/prefer-default-export': 0,
'import/extensions': [0, { jsx: 'always', json: 'always' }],
'no-sequences': ['warn'],
'react/no-unknown-property': 1,
'import/no-unresolved': [2, { ignore: ['@deriv/components', '@deriv/shared'] }],

// react rules
Expand Down
33 changes: 3 additions & 30 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
## Changes:

Please include a summary of the change and which issue is fixed below:
- ...
Please provide a summary of the change.

## When you need to add unit test
### Screenshots:

- [ ] If this change disrupt current flow
- [ ] If this change is adding new flow

## When you need to add integration test

- [ ] If components from external libraries are being used to define the flow, e.g. @deriv/components
- [ ] If it relies on a very specific set of props with no default behavior for the current component.

## Test coverage checklist (for reviewer)

- [ ] Ensure utility / function has a test case
- [ ] Ensure all the tests are passing

## Type of change

- [ ] Bug fix
- [ ] New feature
- [ ] Update feature
- [ ] Refactor code
- [ ] Translation to code
- [ ] Translation to crowdin
- [ ] Script configuration
- [ ] Improve performance
- [ ] Style only
- [ ] Dependency update
- [ ] Documentation update
- [ ] Release
Please provide some screenshots of the change.
20 changes: 20 additions & 0 deletions .github/workflows/automationrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"skip_pending_checks": false,
"skip_slack_integration": false,
"skip_updating_branch": true,
"merge_delay": 120000,
"first_merge_delay": 1200000,
"max_task_count": 15,
"pull_request": {
"checks_timeout": 60000,
"refetch_timeout": 10000,
"refetch_limit": 20,
"checks_limit": 40
},
"circleci": {
"project_slug": "gh/binary-com/deriv-app",
"branch": "master",
"workflow_name": "release_staging"
},
"checks_to_skip": ["/gitguardian/i"]
}
6 changes: 4 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
pull_request:
branches:
- '**'
env:
JEST_MAX_WORKERS: 4
push:
branches:
- master
Expand All @@ -12,10 +14,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
53 changes: 53 additions & 0 deletions .github/workflows/merge_and_release_to_staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Merge and release to staging
permissions:
pull-requests: write
on:
workflow_dispatch:
inputs:
tag:
description: "Tag"
required: true
skip_circleci_checks:
description: "Skip checking CircleCI workflow"
type: boolean
required: false
skip_pending_checks:
description: "Skip waiting for pull request checks"
type: boolean
required: false

concurrency:
group: release_automation_group

jobs:
release_issues:
permissions: write-all
runs-on: ubuntu-latest
timeout-minutes: 600
steps:
- name: Checkout to repo
uses: actions/checkout@v3
with:
ref: master
- name: Setup node
uses: actions/setup-node@v2
- name: Wait for logs to accumulate
run: |
sleep 10
- name: Release issues in Deriv.app
uses: binary-com/fe-toolbox@production_V20230615_0
with:
tag: ${{ inputs.tag }}
platform: 'Deriv.app'
list_id: ${{ secrets.LIST_ID }}
release_tags_list_id: ${{ secrets.RELEASE_TAGS_LIST_ID }}
regression_testing_template_id: ${{ secrets.REGRESSION_TESTING_TEMPLATE_ID }}
config_path: ./.github/workflows/automationrc.json
skip_circleci_checks: ${{ inputs.skip_circleci_checks }}
skip_pending_checks: ${{ inputs.skip_pending_checks }}
CIRCLECI_TOKEN: ${{ secrets.CIRCLECI_TOKEN }}
CLICKUP_API_TOKEN: ${{ secrets.CLICKUP_API_TOKEN }}
SLACK_APP_TOKEN: ${{ secrets.SLACK_APP_TOKEN }}
SLACK_USER_TOKEN: ${{ secrets.SLACK_USER_TOKEN }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
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
42 changes: 0 additions & 42 deletions .github/workflows/run-e2e-test.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
permissions:
issues: write
pull-requests: write

name: 'Close stale issues and PRs'
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
with:
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity. Please reopen it if needed.'
close-pr-message: 'This PR was closed because it has been stalled for 5 days with no activity. Please reopen it if needed.'
days-before-stale: 60
days-before-close: 5
ascending: true
operations-per-run: 200

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
67 changes: 0 additions & 67 deletions e2e_tests/.env.example

This file was deleted.

Loading

0 comments on commit 2ab1ebf

Please sign in to comment.