From 932c331076a5d0d0fbe3a32e66433f5b493c01dc Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 24 Jul 2024 13:21:22 +0200
Subject: [PATCH 1/3] NX affected config

---
 nx.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nx.json b/nx.json
index 54db3a24a3..fb05ea94d0 100644
--- a/nx.json
+++ b/nx.json
@@ -10,7 +10,18 @@
   },
   "targetDefaults": {
     "build": {
-      "inputs": ["{workspaceRoot}/scripts/*", "{workspaceRoot}/lerna.json"]
+      "inputs": [
+        "{workspaceRoot}/scripts/*",
+        "{workspaceRoot}/lerna.json",
+        "{workspaceRoot}/.github/workflows/*"
+      ]
+    },
+    "test": {
+      "inputs": [
+        "{workspaceRoot}/scripts/*",
+        "{workspaceRoot}/lerna.json",
+        "{workspaceRoot}/.github/workflows/*"
+      ]
     }
   },
   "namedInputs": {

From 82c8be5f55eed0ebdb1fb5d07781564835949cdf Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 24 Jul 2024 14:49:23 +0200
Subject: [PATCH 2/3] Fix mssql testcontaint wait strategy

---
 packages/server/src/integrations/tests/utils/mssql.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/integrations/tests/utils/mssql.ts b/packages/server/src/integrations/tests/utils/mssql.ts
index a4bd5448f4..2a4af48725 100644
--- a/packages/server/src/integrations/tests/utils/mssql.ts
+++ b/packages/server/src/integrations/tests/utils/mssql.ts
@@ -22,7 +22,7 @@ export async function getDatasource(): Promise<Datasource> {
         })
         .withWaitStrategy(
           Wait.forSuccessfulCommand(
-            "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Password_123 -q 'SELECT 1'"
+            "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P Password_123 -q 'SELECT 1'"
           )
         )
     )

From 89b57701557bc9bcc8d4c6e07e3cc3aee0c576eb Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 24 Jul 2024 15:22:37 +0200
Subject: [PATCH 3/3] Change image

---
 .github/workflows/budibase_ci.yml                     | 2 +-
 packages/server/src/integrations/tests/utils/mssql.ts | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index d63596f08f..1bc1915a71 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -164,7 +164,7 @@ jobs:
 
       - name: Pull testcontainers images
         run: |
-          docker pull mcr.microsoft.com/mssql/server:2022-latest &
+          docker pull mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04 &
           docker pull mysql:8.3 &
           docker pull postgres:16.1-bullseye &
           docker pull mongo:7.0-jammy &
diff --git a/packages/server/src/integrations/tests/utils/mssql.ts b/packages/server/src/integrations/tests/utils/mssql.ts
index 2a4af48725..ed94477814 100644
--- a/packages/server/src/integrations/tests/utils/mssql.ts
+++ b/packages/server/src/integrations/tests/utils/mssql.ts
@@ -9,7 +9,9 @@ let ports: Promise<testContainerUtils.Port[]>
 export async function getDatasource(): Promise<Datasource> {
   if (!ports) {
     ports = startContainer(
-      new GenericContainer("mcr.microsoft.com/mssql/server:2022-latest")
+      new GenericContainer(
+        "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
+      )
         .withExposedPorts(1433)
         .withEnvironment({
           ACCEPT_EULA: "Y",
@@ -22,7 +24,7 @@ export async function getDatasource(): Promise<Datasource> {
         })
         .withWaitStrategy(
           Wait.forSuccessfulCommand(
-            "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P Password_123 -q 'SELECT 1'"
+            "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Password_123 -q 'SELECT 1'"
           )
         )
     )