Skip to content

Commit

Permalink
reverted commit and fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ameerul-deriv committed Oct 17, 2022
2 parents ea704f6 + 802110d commit 27ef4e0
Show file tree
Hide file tree
Showing 542 changed files with 101,923 additions and 91,663 deletions.
49 changes: 4 additions & 45 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,7 @@ commands:
steps:
- run:
name: "Build all packages"
command: npm run build

build_storybook:
description: "Build storybook"
steps:
- run:
name: "Bootstrap for deriv storybook"
command: npm run build:travis
- run:
name: "Build all packages for deriv storybook"
command: npm run build:storybook
command: npm run build:all

notify_slack:
description: "Notify slack"
Expand Down Expand Up @@ -167,7 +157,7 @@ commands:
name: "Publish to cloudflare pages (staging)"
command: |
npm i wrangler@2.0.19
cd packages/core
cd packages/core
npx wrangler pages publish dist/ --project-name=deriv-app-pages --branch=staging
echo "New staging website - http://staging.cf-pages-deriv-app.deriv.com"
Expand All @@ -176,9 +166,9 @@ commands:
steps:
- run:
name: "Publish to cloudflare pages (production)"
command: |
command: |
npm i wrangler@2.0.19
cd packages/core
cd packages/core
npx wrangler pages publish dist/ --project-name=deriv-app-pages --branch=main
echo "New website - http://cf-pages-deriv-app.deriv.com"
Expand All @@ -191,26 +181,6 @@ jobs:
- npm_install_from_cache
- build

release_storybook:
docker:
- image: cimg/node:16.16.0
steps:
- git_checkout_from_cache
- npm_install_from_cache
- build_storybook
- versioning:
version_name: storybook
- docker_build_push:
docker_image_latest_tag: latest
docker_image_name: "deriv-app-storybook"
docker_file: "Dockerfile-storybook"
- k8s_deploy:
k8s_namespace: "deriv-app-storybook-production"
k8s_service: "deriv-app-storybook"
- notify_slack
environment:
NODE_ENV: staging

release_staging:
docker:
- image: cimg/node:16.16.0
Expand Down Expand Up @@ -284,16 +254,6 @@ jobs:
command: npm test

workflows:
release_storybook:
jobs:
- release_storybook:
context: binary-frontend-artifact-upload
filters:
branches:
ignore: /.*/
tags:
only: /^storybook.*/

release_staging:
jobs:
- release_staging:
Expand Down Expand Up @@ -338,4 +298,3 @@ workflows:
- gh-pages
tags:
ignore: /.*/

4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
run: |
npm install
npm run bootstrap
npm run build
npm run build:all
npm run test:jest
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3.1.1
with:
directory: ./coverage
fail_ci_if_error: true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ packages/p2p/lib/
packages/appstore/dist/
packages/appstore/lib/
.env
nx-cloud.env

5 changes: 5 additions & 0 deletions nx-cloud.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# To have nx cloud caching, make a copy of this file and name it nx-cloud.env,
# then replace the <TOKEN> with nx-cloud token provided in the lastpass shared-FE section.

NX_CLOUD_ACCESS_TOKEN=<TOKEN>
NX_CLOUD_NO_TIMEOUTS=true
46 changes: 46 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"extends": "nx/presets/npm.json",
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": [
"build",
"test",
"test:eslint",
"package",
"prepare",
"build:travis"
]
}
}
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
],
"prepare": [
{
"target": "prepare",
"projects": "dependencies"
}
],
"package": [
{
"target": "package",
"projects": "dependencies"
}
]
},
"affected": {
"defaultBase": "master"
},
"pluginsConfig": {
"@nrwl/js": {
"analyzeSourceFiles": false
}
}
}
Loading

0 comments on commit 27ef4e0

Please sign in to comment.