merged with release

.editorconfig

@@ -9,5 +9,5 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.java,pom.xml,*.py}]
+[{*.java,pom.xml,*.py,*.sql}]
 indent_size = 4

.github/workflows/build-docker-image.yml

@@ -9,11 +9,6 @@ on:
         description: "This is the PR number in case the workflow is being called in a pull request"
         required: false
         type: number
-      is-pg-build:
-        description: "This is a boolean value in case the workflow is being called for a PG build"
-        required: false
-        type: string
-        default: "false"
 
 jobs:
   build-docker:
@@ -79,6 +74,12 @@ jobs:
           if [[ -f scripts/generate_info_json.sh ]]; then
             scripts/generate_info_json.sh
           fi
+      
+      - name: Place server artifacts-es
+        env:
+          EDITION: ${{ vars.EDITION }}
+        run: |
+          scripts/prepare_server_artifacts.sh
 
       - name: Set base image tag
         id: set_base_tag

.github/workflows/pr-cypress.yml

@@ -62,7 +62,6 @@ jobs:
     secrets: inherit
     with:
       pr: ${{ github.event.number }}
-      is-pg-build: ${{ inputs.is-pg-build }}
 
   ci-test:
     needs: [build-docker-image]

.github/workflows/test-build-docker-image.yml

@@ -23,7 +23,7 @@ on:
 
   # trigger for pushes to master and pg
   push:
-    branches: [master, pg]
+    branches: [master]
     paths:
       - "app/client/**"
       - "app/server/**"
@@ -59,6 +59,18 @@ jobs:
             echo "matrix=[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]" >> $GITHUB_OUTPUT
           fi
 
+  invoke-tbp-workflow-for-pg:
+    needs: [setup]
+    if: github.event_name != 'push' && github.ref == 'refs/heads/release'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger TBP on pg branch
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: test-build-docker-image.yml
+          inputs: '{ "tags": "${{needs.setup.outputs.tags}}", "ted_tag": "${{inputs.ted_tag}}" }'
+          ref: refs/heads/pg
+
   server-build:
     needs: [setup]
     if: success()
@@ -100,7 +112,7 @@ jobs:
   ci-test:
     needs: [setup, build-docker-image]
     # Only run if the build step is successful
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master')
     name: ci-test
     uses: ./.github/workflows/ci-test-custom-script.yml
     secrets: inherit
@@ -113,17 +125,18 @@ jobs:
   server-unit-tests:
     name: server-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master')
     uses: ./.github/workflows/server-build.yml
     secrets: inherit
     with:
       pr: 0
       skip-tests: false
+      is-pg-build: ${{ github.ref == 'refs/heads/pg' }}
 
   client-unit-tests:
     name: client-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master')
     uses: ./.github/workflows/client-unit-tests.yml
     secrets: inherit
     with:

.gitignore

@@ -5,6 +5,9 @@
 stacks
 /deploy/docker/fs/opt/appsmith/info.json
 
+# Server artifacts
+/deploy/docker/fs/opt/appsmith/server
+
 # to ignore the node_modeules folder
 node_modules
 # to ignore the package-lock.json file
@@ -36,3 +39,5 @@ app/client/.fleet/*
 # Observability related local storage
 utils/observability/tempo-data/*
 
+# Ignore the mongo data backup directory for Mongo to PG migrations
+mongo-data**

Dockerfile

@@ -3,10 +3,6 @@ FROM ${BASE}
 
 ENV IN_DOCKER=1
 
-# Add backend server - Application Layer
-ARG JAR_FILE=./app/server/dist/server-*.jar
-ARG PLUGIN_JARS=./app/server/dist/plugins/*.jar
-
 ARG APPSMITH_CLOUD_SERVICES_BASE_URL
 ENV APPSMITH_CLOUD_SERVICES_BASE_URL=${APPSMITH_CLOUD_SERVICES_BASE_URL}
 
@@ -16,7 +12,17 @@ ENV APPSMITH_SEGMENT_CE_KEY=${APPSMITH_SEGMENT_CE_KEY}
 COPY deploy/docker/fs /
 
 RUN <<END
-  mkdir -p ./editor ./rts ./backend/plugins
+  if ! [ -f info.json ]; then
+    echo "Missing info.json" >&2
+    exit 1
+  fi
+
+  if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
+    echo "Missing one or both server.jar files in the right place. Are you using the build script?" >&2
+    exit 1
+  fi
+
+  mkdir -p ./editor ./rts
 
   # Ensure all *.sh scripts are executable.
   find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
@@ -25,10 +31,6 @@ RUN <<END
   chmod +x /opt/bin/*
 END
 
-#Add the jar to the container
-COPY ${JAR_FILE} backend/server.jar
-COPY ${PLUGIN_JARS} backend/plugins/
-
 # Add client UI - Application Layer
 COPY ./app/client/build editor/
 

app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js

@@ -9,7 +9,7 @@ import {
 
 describe(
   "Import, Export and Fork application and validate data binding",
-  { tags: ["@tag.ImportExport"] },
+  { tags: ["@tag.ImportExport", "@tag.Sanity"] },
   function () {
     let workspaceId;
     let newWorkspaceName;