From e051caca47b0ed5a52aad3ec346acdfb2262a31b Mon Sep 17 00:00:00 2001
From: Adish M <44204658+adishM98@users.noreply.github.com>
Date: Thu, 3 Jul 2025 21:47:25 +0530
Subject: [PATCH] fix: Update environment variable secrets for cloud deployment
 (#13171)

* fix: Update environment variable secrets for cloud deployment

* Add submodule checkout step to cloud frontend deployment workflow

* fix: Update checkout step to use actions/checkout@v4 and streamline configuration

* fix: Add missing environment variables for cloud deployment

* Update Node.js and NPM versions in Netlify configuration
---
 .github/workflows/cloud-frontend.yml | 37 +++++++++++++++++++---------
 netlify.toml                         |  7 +++---
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/cloud-frontend.yml b/.github/workflows/cloud-frontend.yml
index ee8c59ab4a..e8d4171248 100644
--- a/.github/workflows/cloud-frontend.yml
+++ b/.github/workflows/cloud-frontend.yml
@@ -36,10 +36,12 @@ jobs:
       #       exit 1
       #     fi
 
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - name: Checkout code (with submodules)
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch }}
+          token: ${{ secrets.TOKEN_PR }}
+          submodules: recursive
 
       - name: Setup Node.js
         uses: actions/setup-node@v2
@@ -52,16 +54,16 @@ jobs:
       - name: Build the project
         run: npm run build:plugins:prod && npm run build:frontend
         env:
-          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
-          NODE_ENV: ${{ secrets.NODE_ENV }}
-          NODE_OPTIONS: ${{ secrets.NODE_OPTIONS }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-          SERVE_CLIENT: ${{ secrets.SERVE_CLIENT }}
-          SERVER_IP: ${{ secrets.SERVER_IP }}
-          TJDB_SQL_MODE_DISABLE: ${{ secrets.TJDB_SQL_MODE_DISABLE }}
-          TOOLJET_SERVER_URL: ${{ secrets.TOOLJET_SERVER_URL }}
+          GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }}
+          NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }}
+          NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }}
+          SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }}
+          SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }}
+          TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
+          TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
           TOOLJET_EDITION: cloud
 
       - name: Deploy to Netlify
@@ -70,6 +72,17 @@ jobs:
           netlify deploy --prod --dir=frontend/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.CLOUD_NETLIFY_SITE_ID }}
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }}
+          NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }}
+          NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }}
+          SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }}
+          SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }}
+          TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
+          TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
+          TOOLJET_EDITION: cloud
 
       - name: ✅ Deployment complete
         run: echo "🎉 Deployment to Netlify successful for branch ${{ github.event.inputs.branch }} by ${{ github.actor }}"
diff --git a/netlify.toml b/netlify.toml
index b6e4bc7077..cea3f8a356 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,9 +4,10 @@
   command = "npm run build:plugins:prod && npm run build:frontend"
 
 [template.environment]
-  NODE_ENV = "production"  
-  NODE_VERSION = "14.17.3"
-  NPM_VERSION = "7.20.0"
+  NODE_ENV = "production"
+  TOOOLJET_EDITION = "cloud"
+  NODE_VERSION = "22.15.1"
+  NPM_VERSION = "10.9.2"
 
 [[redirects]]
   from = "/*"