Merge branch 'master' into 862juqpq4/add-use-subscription-hook-for-we…

…bsite-status
binary-com · Jul 5, 2023 · adb6bf4 · adb6bf4
2 parents 5207b1c + 7073665
commit adb6bf4
Show file tree

Hide file tree

Showing 144 changed files with 73,070 additions and 27,048 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -77,6 +77,7 @@ commands:
             - "packages/trader/node_modules"
             - "packages/translations/node_modules"
             - "packages/utils/node_modules"
+            - "packages/analytics/node_modules"
             # VERIFY_CACHE_FOLDERS_END (DO NOT REMOVE)
 
   build:
@@ -264,6 +265,9 @@ jobs:
       - run:
           name: "Check TypeScript for @deriv/utils"
           command: npx tsc --project packages/utils/tsconfig.json -noEmit
+      - run:
+          name: "Check TypeScript for @deriv/analytics"
+          command: npx tsc --project packages/analytics/tsconfig.json -noEmit
       - run:
           name: "Check TypeScript for @deriv/stores"
           command: npx tsc --project packages/stores/tsconfig.json -noEmit
@@ -276,6 +280,9 @@ jobs:
       - run:
           name: "Check tests for @deriv/utils"
           command: bash ./scripts/check-tests.sh packages/utils/src
+      - run:
+          name: "Check tests for @deriv/analytics"
+          command: bash ./scripts/check-tests.sh packages/analytics/src
       - build
       - run:
           name: "Run tests"

diff --git a/.github/workflows/merge_and_release_to_staging.yml b/.github/workflows/merge_and_release_to_staging.yml
@@ -25,13 +25,17 @@ jobs:
     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@v0.0.1
+        uses: binary-com/fe-toolbox@v0.0.2
         with:
           release_tag_task_url: ${{ inputs.release_tag_task_url }}
           platform: 'Deriv.app'