Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into Vinu/304/fix-mino…
Browse files Browse the repository at this point in the history
…r-code-smells
  • Loading branch information
vinu-deriv committed Sep 19, 2023
2 parents 0bc3cf9 + 5f0713a commit e8138e7
Show file tree
Hide file tree
Showing 1,084 changed files with 40,346 additions and 23,319 deletions.
56 changes: 3 additions & 53 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ commands:
- "packages/hooks/node_modules"
- "packages/cfd/node_modules"
- "packages/indicators/node_modules"
- "packages/integration/node_modules"
- "packages/p2p/node_modules"
- "packages/reports/node_modules"
- "packages/shared/node_modules"
Expand Down Expand Up @@ -109,53 +110,6 @@ commands:
name: Tag
command: echo "<< parameters.version_name >>-$(date -u +"%Y-%m-%dT%H:%M:%SZ")" > packages/core/dist/version

docker_build_push:
description: "Build and Push image to docker hub"
parameters:
docker_image_latest_tag:
type: string
default: "latest-staging"
docker_image_name:
type: string
default: "deriv-app"
docker_file:
type: string
default: "Dockerfile"
steps:
- setup_remote_docker
- run:
name: Building docker image
command: |
TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
docker build -t ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:${TAG} -t ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:<< parameters.docker_image_latest_tag >> -f << parameters.docker_file >> .
- 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 >>:<< parameters.docker_image_latest_tag >>
docker push ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:${TAG}
k8s_deploy:
description: "Deploy to k8s cluster"
parameters:
k8s_namespace:
type: string
default: "deriv-app-staging"
k8s_service:
type: string
default: "deriv-app"
steps:
- k8s/install-kubectl
- run:
name: Deploying to k8s cluster to namespace << parameters.k8s_namespace >>
command: |
TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
export NAMESPACE=<< parameters.k8s_namespace >>
git clone https://github.com/binary-com/devops-ci-scripts
cd devops-ci-scripts/k8s-build_tools
echo $CA_CRT | base64 --decode > ca.crt
./release.sh << parameters.k8s_service >> ${TAG}
publish_to_pages_staging:
description: "Publish to cloudflare pages"
steps:
Expand Down Expand Up @@ -202,8 +156,6 @@ jobs:
root: packages
paths:
- core
- docker_build_push
- k8s_deploy
- notify_slack
environment:
NODE_ENV: staging
Expand All @@ -222,10 +174,8 @@ jobs:
root: packages
paths:
- core
- docker_build_push:
docker_image_latest_tag: latest
- k8s_deploy:
k8s_namespace: "deriv-app-production"


- notify_slack
environment:
NODE_ENV: staging
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ packages/appstore/lib/
packages/appstore/.out
.env
nx-cloud.env

test-results/
playwright-report/
playwright/.cache/
2 changes: 1 addition & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = {
'shorthand-property-no-redundant-values': true,
'string-no-newline': true,
'time-min-milliseconds': 100,
'unit-allowed-list': ['fr', 'px', 'em', 'rem', '%', 'vw', 'vh', 'deg', 'ms', 's', 'dpcm'],
'unit-allowed-list': ['fr', 'px', 'em', 'rem', '%', 'svh', 'vw', 'vh', 'deg', 'ms', 's', 'dpcm'],
'value-keyword-case': 'lower',
},
extends: [
Expand Down
16 changes: 0 additions & 16 deletions end-to-end-test/.env.example

This file was deleted.

27 changes: 0 additions & 27 deletions end-to-end-test/.github/workflows/playwright.yml

This file was deleted.

4 changes: 0 additions & 4 deletions end-to-end-test/.gitignore

This file was deleted.

63 changes: 0 additions & 63 deletions end-to-end-test/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions end-to-end-test/global-setup.ts

This file was deleted.

21 changes: 0 additions & 21 deletions end-to-end-test/package.json

This file was deleted.

118 changes: 0 additions & 118 deletions end-to-end-test/playwright.config.ts

This file was deleted.

Loading

0 comments on commit e8138e7

Please sign in to comment.