fix: merge conflicts

aswathy-deriv · Apr 18, 2024 · 98d3b36 · 98d3b36
2 parents e997d28 + 6b70f53
commit 98d3b36
Show file tree

Hide file tree

Showing 180 changed files with 36,845 additions and 38,414 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -24,6 +24,7 @@ env:
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
     GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
     GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+    GATSBY_DATABASE_URL: ${{ secrets.GATSBY_DATABASE_URL }}
 
 jobs:
     release-beta:
@@ -52,7 +53,7 @@ jobs:
             # - run: npm run format
             # - run: npm run test
             - run: npm run build
-            - uses: olegtarasov/get-tag@v2.1
+            - uses: olegtarasov/get-tag@53af8e1e538a0ffab949cdde3e332d8e58e8630f
               id: tagName
               # For using same tag for staging and production we need to uncomment these two below lines:
               # with:
@@ -69,7 +70,7 @@ jobs:
               run: echo "New beta website - https://beta.deriv.com"
 
             - name: Slack Notification 📣
-              uses: 8398a7/action-slack@v3
+              uses: 8398a7/action-slack@21dc5d142b92115d9c154540e48df504ad4e9cf9
               with:
                   status: ${{ job.status }}
                   fields: workflow,repo

diff --git a/.github/workflows/corewebvitals.yml b/.github/workflows/corewebvitals.yml
@@ -64,7 +64,7 @@ jobs:
                       - Cumulative Layout Shift: ${{ steps.results.outputs.cls }}
 
             - name: Slack Notification 📣
-              uses: 8398a7/action-slack@v3
+              uses: 8398a7/action-slack@21dc5d142b92115d9c154540e48df504ad4e9cf9
               if: ${{ failure() }}
               with:
                   status: custom

diff --git a/.github/workflows/generate-preview-link-eu.yml b/.github/workflows/generate-preview-link-eu.yml
@@ -17,8 +17,8 @@ jobs:
     build_eu_to_cloudflare_pages:
         runs-on: Ubuntu-latest
         permissions:
-          checks: write
-          pull-requests: write
+            checks: write
+            pull-requests: write
         steps:
             - name: Verify user
               uses: 'deriv-com/shared-actions/.github/actions/verify_user_in_organization@v1'
@@ -67,7 +67,7 @@ jobs:
                       sites/eu/.cache
                       sites/eu/public
             - name: Install Dependencies
-              uses: "./.github/actions/npm_install_from_cache"
+              uses: './.github/actions/npm_install_from_cache'
 
             - name: Build project
               id: build-project
@@ -81,19 +81,21 @@ jobs:
                   GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
                   GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
                   GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+                  GATSBY_DATABASE_URL: ${{ secrets.GATSBY_DATABASE_URL }}
 
               run: npm run build:eu
-
             - name: Retrieve PR information
               env:
                   EVENT_NUMBER: ${{ github.event.number }}
                   EVENT_USERNAME: ${{ github.event.pull_request.user.login }}
                   HEAD_REF: ${{ github.head_ref }}
+                  DRAFT: ${{ github.event.pull_request.draft }}
               run: |
                   mkdir -p .pr
                   echo "$EVENT_NUMBER" > .pr/NR
                   echo "$EVENT_USERNAME" > .pr/USERNAME
                   echo "$HEAD_REF" > .pr/BRANCHNAME
+                  echo "$DRAFT" > .pr/DRAFT
             - name: Publish to Cloudflare Pages
               id: publish-to-pages
               env:
@@ -166,4 +168,4 @@ jobs:
               uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
               with:
                   name: 'pr-${{github.run_id}}'
-                  path: .pr
+                  path: .pr
diff --git a/.github/workflows/generate-preview-link-row.yml b/.github/workflows/generate-preview-link-row.yml
@@ -17,8 +17,8 @@ jobs:
     build_row_to_cloudflare_pages:
         runs-on: Ubuntu-latest
         permissions:
-          checks: write
-          pull-requests: write
+            checks: write
+            pull-requests: write
         steps:
             - name: Verify user
               uses: 'deriv-com/shared-actions/.github/actions/verify_user_in_organization@v1'
@@ -69,7 +69,7 @@ jobs:
                       sites/row/public
 
             - name: Install Dependencies
-              uses: "./.github/actions/npm_install_from_cache"
+              uses: './.github/actions/npm_install_from_cache'
 
             - name: Build project
               id: build-project
@@ -83,6 +83,7 @@ jobs:
                   GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
                   GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
                   GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+                  GATSBY_DATABASE_URL: ${{ secrets.GATSBY_DATABASE_URL }}
 
               run: npm run build:row
 
@@ -91,12 +92,13 @@ jobs:
                   EVENT_NUMBER: ${{ github.event.number }}
                   EVENT_USERNAME: ${{ github.event.pull_request.user.login }}
                   HEAD_REF: ${{ github.head_ref }}
+                  DRAFT: ${{ github.event.pull_request.draft }}
               run: |
                   mkdir -p .pr
                   echo "$EVENT_NUMBER" > .pr/NR
                   echo "$EVENT_USERNAME" > .pr/USERNAME
                   echo "$HEAD_REF" > .pr/BRANCHNAME
-
+                  echo "$DRAFT" > .pr/DRAFT
             - name: Publish to Cloudflare Pages
               id: publish-to-pages
               env:

diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml