Merge branch 'deriv-com:master' into kate/DTRA-1014/add_check_for_hea…

…der_hash
deriv-com · Jun 3, 2024 · c01a48a · c01a48a
2 parents 9671c39 + 797c787
commit c01a48a
Show file tree

Hide file tree

Showing 28 changed files with 311 additions and 279 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,13 +1,15 @@
 name: Build
-description: Build dist 
+description: Build dist
 inputs:
   target:
-    description: 'Target Environment'
+    description: "Target Environment"
     required: true
     default: staging
 runs:
   using: composite
   steps:
-  - name: Building dist for ${{ inputs.target }}
-    run: node_modules/grunt/bin/grunt releaseci --${{ inputs.target }}
-    shell: bash
+    - name: Building dist for ${{ inputs.target }}
+      env:
+        TARGET_ENV: ${{ inputs.target }}
+      run: node_modules/grunt/bin/grunt releaseci --$TARGET_ENV
+      shell: bash
diff --git a/.github/actions/build_and_push_docker_image/action.yml b/.github/actions/build_and_push_docker_image/action.yml
@@ -31,36 +31,47 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Setup Environment variables
-      run: |
-        echo "NAMESPACE=${{ inputs.K8S_NAMESPACE }}" >> "$GITHUB_ENV"
-        echo "KUBE_SERVER=${{ inputs.KUBE_SERVER }}" >> "$GITHUB_ENV"
-        echo "SERVICEACCOUNT_TOKEN=${{ inputs.SERVICEACCOUNT_TOKEN }}" >> "$GITHUB_ENV"
-        echo "DOCKERHUB_ORGANISATION=${{ inputs.DOCKERHUB_ORGANISATION }}" >> "$GITHUB_ENV"
-        echo "CA_CRT=${{ inputs.CA_CRT }}" >> "$GITHUB_ENV"
-        echo "APP_NAME=smarttrader-deriv-app" >> "$GITHUB_ENV"
-        echo "APP_VERSION=${{ inputs.APP_VERSION }}" >> "$GITHUB_ENV"
-      shell: bash
     - name: Build docker image 🐳
-      run: docker build -t ${DOCKERHUB_ORGANISATION}/${APP_NAME}:${APP_VERSION} -t ${DOCKERHUB_ORGANISATION}/${APP_NAME}:${{ github.ref_name }} .
+      env:
+        DOCKERHUB_ORGANISATION: ${{ inputs.DOCKERHUB_ORGANISATION }}
+        APP_NAME: smarttrader-deriv-app
+        APP_VERSION: ${{ inputs.APP_VERSION }}
+      run: docker build -t $DOCKERHUB_ORGANISATION/$APP_NAME:$APP_VERSION -t $DOCKERHUB_ORGANISATION/$APP_NAME:${{ github.ref_name }} .
       shell: bash
     - name: Verify nginx image
+      env:
+        DOCKERHUB_ORGANISATION: ${{ inputs.DOCKERHUB_ORGANISATION }}
+        APP_NAME: smarttrader-deriv-app
       run: |
         set -e
-        docker run --rm ${DOCKERHUB_ORGANISATION}/${APP_NAME}:${{ github.ref_name }} nginx -t
+        docker run --rm $DOCKERHUB_ORGANISATION/$APP_NAME:${{ github.ref_name }} nginx -t
         echo "docker image validated successfully"
       shell: bash
     - name: Pushing Image to docker hub 🐳
+      env:
+        DOCKERHUB_ORGANISATION: ${{ inputs.DOCKERHUB_ORGANISATION }}
+        APP_NAME: smarttrader-deriv-app
+        APP_VERSION: ${{ inputs.APP_VERSION }}
+        DOCKERHUB_USERNAME: ${{ inputs.DOCKERHUB_USERNAME }}
+        DOCKERHUB_PASSWORD: ${{ inputs.DOCKERHUB_PASSWORD }}
       run: |
-        echo ${{ inputs.DOCKERHUB_PASSWORD }}| docker login -u ${{ inputs.DOCKERHUB_USERNAME }} --password-stdin
-        docker push ${DOCKERHUB_ORGANISATION}/${APP_NAME}:${APP_VERSION}
-        docker push ${DOCKERHUB_ORGANISATION}/${APP_NAME}:${{ github.ref_name }}
+        echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
+        docker push $DOCKERHUB_ORGANISATION/$APP_NAME:$APP_VERSION
+        docker push $DOCKERHUB_ORGANISATION/$APP_NAME:${{ github.ref_name }}
       shell: bash
     - name: Deploy 🚀
+      env:
+        NAMESPACE: ${{ inputs.K8S_NAMESPACE }}
+        KUBE_SERVER: ${{ inputs.KUBE_SERVER }}
+        SERVICEACCOUNT_TOKEN: ${{ inputs.SERVICEACCOUNT_TOKEN }}
+        DOCKERHUB_ORGANISATION: ${{ inputs.DOCKERHUB_ORGANISATION }}
+        CA_CRT: ${{ inputs.CA_CRT }}
+        APP_NAME: smarttrader-deriv-app
+        APP_VERSION: ${{ inputs.APP_VERSION }}
       run: |
         git clone https://github.com/binary-com/devops-ci-scripts
         cd devops-ci-scripts/k8s-build_tools
         echo $CA_CRT | base64 --decode > ca.crt
         export CA="ca.crt"
-        ./release.sh ${APP_NAME} ${{ github.ref_name }}
+        ./release.sh $APP_NAME ${{ github.ref_name }}
       shell: bash
diff --git a/.github/actions/notify_slack/action.yml b/.github/actions/notify_slack/action.yml
diff --git a/.github/actions/versioning/action.yml b/.github/actions/versioning/action.yml
@@ -2,11 +2,13 @@ name: versioning
 description: Tag build
 inputs:
   target_branch:
-    description: 'Target branch'
+    description: "Target branch"
     required: false
 runs:
   using: composite
   steps:
-  - name: Tag build
-    run: echo "${{ inputs.target_branch }} $(date -u +'%Y-%m-%dT%H:%M:%SZ')" > dist/version.txt
-    shell: bash
+    - name: Tag build
+      env:
+        TARGET_BRANCH: ${{ inputs.target_branch }}
+      run: echo "$TARGET_BRANCH $(date -u +'%Y-%m-%dT%H:%M:%SZ')" > dist/version.txt
+      shell: bash
diff --git a/.github/workflows/generate_preview_link.yml b/.github/workflows/generate_preview_link.yml
@@ -42,7 +42,7 @@ jobs:
           node-version: 18.x
 
       - name: Install dependencies
-        uses: "deriv-com/shared-actions/.github/actions/npm_install@v1"
+        uses: "deriv-com/shared-actions/.github/actions/npm_install@master"
 
       - name: Build
         uses: "./.github/actions/build"

diff --git a/.github/workflows/release_production.yml b/.github/workflows/release_production.yml
@@ -7,6 +7,8 @@ jobs:
   build_and_test:
     name: Build and Test
     runs-on: ubuntu-latest
+    env:
+      RELEASE_TYPE: Production
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -34,6 +36,8 @@ jobs:
   publish_cloudflare_production:
     name: Publish to Cloudflare Production
     runs-on: ubuntu-latest
+    env:
+      RELEASE_TYPE: Production
     needs: [build_and_test]
     steps:
       - name: Checkout
@@ -53,6 +57,7 @@ jobs:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
       - name: Build Docker image and push to Docker hub and K8S
+        id: build_and_push_docker_image
         uses: "./.github/actions/build_and_push_docker_image"
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -63,12 +68,19 @@ jobs:
           SERVICEACCOUNT_TOKEN: ${{ secrets.SERVICEACCOUNT_TOKEN }}
           CA_CRT: ${{ secrets.CA_CRT }}
           APP_VERSION: latest
-
+      - name: Send Slack Notification on Docker Publish and Kubernetes Deployment Failure
+        if: ${{ steps.build_and_push_docker_image.outcome != 'success' }}
+        uses: "deriv-com/shared-actions/.github/actions/send_slack_notification@master"
+        with:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          MESSAGE: "$RELEASE_TYPE Docker Publish and Kubernetes Deployment for smarttrader.deriv.com with version ${{ needs.build_and_test.outputs.RELEASE_VERSION }} has Failed"
   notify_on_slack:
     name: Notify on Slack
     if: always()
     runs-on: ubuntu-latest
-
+    env:
+      RELEASE_TYPE: Production
+      APP_NAME: smarttrader-deriv-app
     needs: [publish_cloudflare_production, build_and_test]
     steps:
       - name: Checkout
@@ -79,7 +91,6 @@ jobs:
           node-version: 20
       - name: Conclusion
         uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5
-
       - name: Download Artifacts
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
         with:
@@ -88,10 +99,16 @@ jobs:
       - name: Grab Version Name
         id: extract_version
         run: echo "RELEASE_VERSION=$(cat dist/version.txt)" >> $GITHUB_ENV
+      - name: Create Slack Message
+        id: create_slack_message
+        run: |
+          if [ $WORKFLOW_CONCLUSION == "success" ]; then
+            echo "MESSAGE=$RELEASE_TYPE Release succeeded for $APP_NAME with version ${{ needs.build_and_test.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
+          else
+            echo "MESSAGE=$RELEASE_TYPE Release failed for $APP_NAME with version ${{ needs.build_and_test.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
+          fi
       - name: Send Slack Notification
-        uses: "./.github/actions/notify_slack"
+        uses: "deriv-com/shared-actions/.github/actions/send_slack_notification@master"
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          status: ${{ env.WORKFLOW_CONCLUSION }}
-          release_type: Production
-          version: ${{ steps.extract_version.outputs.RELEASE_VERSION }}
+          MESSAGE: ${{ steps.create_slack_message.outputs.MESSAGE }}
diff --git a/build/aliases.yaml b/build/aliases.yaml
@@ -64,3 +64,4 @@ release:
 releaseci:
   - 'default'
   - 'shell:compile_production'
+  - 'hashres'
diff --git a/build/copy.js b/build/copy.js
@@ -13,9 +13,6 @@ module.exports = function (grunt) {
                 { expand: true, cwd: 'src/download/fonts', src: ['binary_symbols.woff'], dest: `${global.dist}/download/fonts/` },
 
                 { expand: true, src: ['favicon.ico'], dest: global.dist },
-
-                // Serve pushwoosh SDKs
-                { expand: true, cwd: 'src/javascript/_common/lib/pushwooshSDK/', src: ['**'], dest: global.dist },
                 { expand: true, cwd: 'src/root_files/app', src: ['**', '!index.html'], dest: 'dist' }, // top level
                 { expand: true, cwd: 'src/root_files/app', src: ['index.html'],        dest: global.dist },
 

diff --git a/build/hashres.js b/build/hashres.js
@@ -0,0 +1,17 @@
+module.exports = {
+  options: {
+    encoding: "utf8",
+    length: 8,
+    algorithm: "md5",
+    renameFiles: false,
+    fileNameFormat: "${name}.${ext}?${hash}",
+  },
+  main: {
+    src: [
+      "dist/css/*.css",
+      "dist/js/**/*.js",
+      "dist/images/**/*.{png,jpg,jpeg,gif,webp,svg}",
+    ],
+    dest: "dist/**/*.html",
+  },
+};
diff --git a/build/postcss.js b/build/postcss.js
@@ -2,7 +2,13 @@ module.exports = function (grunt) {
     return {
         options: {
             processors: [
-                require('autoprefixer')()
+                require('autoprefixer')(),
+                require('postcss-cachebuster')({
+                    supportedProps: [
+                        'background',
+                        'background-image',
+                    ],
+                }),
             ],
         },
         dist: {

diff --git a/build/webpack/plugins.js b/build/webpack/plugins.js
@@ -1,4 +1,5 @@
 const CircularDependencyPlugin = require('circular-dependency-plugin');
+const CryptoJS   = require('crypto-js');
 const path                     = require('path');
 const webpack                  = require('webpack');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
@@ -47,7 +48,8 @@ const getPlugins = (app, grunt) => ([
 
             new webpack.DefinePlugin({
                 'process.env': {
-                    NODE_ENV: JSON.stringify('production'),
+                    BUILD_HASH: JSON.stringify(CryptoJS.MD5(Date.now().toString()).toString()),
+                    NODE_ENV  : JSON.stringify('production'),
                 },
             }),
         ]
@@ -60,6 +62,11 @@ const getPlugins = (app, grunt) => ([
                     openAnalyzer  : false,
                 }),
             ]),
+            new webpack.DefinePlugin({
+                'process.env': {
+                    BUILD_HASH: JSON.stringify(CryptoJS.MD5(Date.now().toString()).toString()),
+                },
+            }),
         ]
     ),
 ]);

diff --git a/favicon.ico b/favicon.ico