From b925a347d2ffdcd7144c7dfcad62fcd9f3deeb1a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:35:04 +0300
Subject: [PATCH 01/15] Remove fetch-depth

---
 .github/workflows/budibase_ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 08fc2fe0b8..683f8cbfe8 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -173,7 +173,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
-          fetch-depth: 0
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Check pro commit

From a882e3341f4927f467b36e436fb017261cf11147 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:43:31 +0300
Subject: [PATCH 02/15] Add since flag

---
 .github/workflows/budibase_ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 683f8cbfe8..135fa035f5 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,6 +18,7 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+  NX_BASE_BRANCH: ${{ github.base_ref || "origin/master"}}
 
 jobs:
   lint:
@@ -61,9 +62,9 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       # Run build all the projects
-      - run: yarn build
+      - run: yarn build --since=${{ NX_BASE_BRANCH }}
       # Check the types of the projects built via esbuild
-      - run: yarn check:types
+      - run: yarn check:types --since=${{ NX_BASE_BRANCH }}
 
   test-libraries:
     runs-on: ubuntu-latest
@@ -84,7 +85,7 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro
+      - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
@@ -111,7 +112,7 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - name: Test worker and server
-        run: yarn test --scope=@budibase/worker --scope=@budibase/server
+        run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN || github.token }} # not required for public repos
@@ -134,7 +135,7 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn test --scope=@budibase/pro
+      - run: yarn test --scope=@budibase/pro --since=${{ NX_BASE_BRANCH }}
 
   integration-test:
     runs-on: ubuntu-latest

From 19b3def9b855355b7c31df1a8808eabf19b49d05 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:45:59 +0300
Subject: [PATCH 03/15] Fix env

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 135fa035f5..b12b371f24 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,7 +18,7 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  NX_BASE_BRANCH: ${{ github.base_ref || "origin/master"}}
+  NX_BASE_BRANCH: ${{ github.base_ref || origin/master}}
 
 jobs:
   lint:

From 3e7da2bfd10b9cdb495a1d632196f756209d7d44 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:47:10 +0300
Subject: [PATCH 04/15] Fix

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index b12b371f24..3218f69ff6 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,7 +18,7 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  NX_BASE_BRANCH: ${{ github.base_ref || origin/master}}
+  NX_BASE_BRANCH: ${{ github.base_ref || 'origin/master'}}
 
 jobs:
   lint:

From 49bc467eb982686af6cd014e8d31dd9908148da6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:48:16 +0300
Subject: [PATCH 05/15] Prefix env

---
 .github/workflows/budibase_ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 3218f69ff6..ea00c9438a 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -62,9 +62,9 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       # Run build all the projects
-      - run: yarn build --since=${{ NX_BASE_BRANCH }}
+      - run: yarn build --since=${{ env.NX_BASE_BRANCH }}
       # Check the types of the projects built via esbuild
-      - run: yarn check:types --since=${{ NX_BASE_BRANCH }}
+      - run: yarn check:types --since=${{ env.NX_BASE_BRANCH }}
 
   test-libraries:
     runs-on: ubuntu-latest
@@ -85,7 +85,7 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ NX_BASE_BRANCH }}
+      - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
@@ -112,7 +112,7 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - name: Test worker and server
-        run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ NX_BASE_BRANCH }}
+        run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN || github.token }} # not required for public repos
@@ -135,7 +135,7 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn test --scope=@budibase/pro --since=${{ NX_BASE_BRANCH }}
+      - run: yarn test --scope=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
 
   integration-test:
     runs-on: ubuntu-latest

From d5d5c21ef80afcb09fd9eee992d1adf5bb1cef88 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:56:44 +0300
Subject: [PATCH 06/15] Change build to run in lerna

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4294e83883..4e4befb5f2 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "preinstall": "node scripts/syncProPackage.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
     "bootstrap": "./scripts/link-dependencies.sh && echo '***BOOTSTRAP ONLY REQUIRED FOR USE WITH ACCOUNT PORTAL***'",
-    "build": "yarn nx run-many -t=build",
+    "build": "lerna run build --stream",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run check:types",
     "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap",

From 987ee1b8b27b612f66ba165291311e002df503b9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 11:58:29 +0300
Subject: [PATCH 07/15] Prefix NX_BASE_BRANCH

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index ea00c9438a..693d81372d 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,7 +18,7 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  NX_BASE_BRANCH: ${{ github.base_ref || 'origin/master'}}
+  NX_BASE_BRANCH: origin/${{ github.base_ref || 'master'}}
 
 jobs:
   lint:

From 5eb49fbb293a737afd528e640701b425fd80ff2a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 12:08:39 +0300
Subject: [PATCH 08/15] Fetch remote refs

---
 .github/workflows/budibase_ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 693d81372d..52bff87e0c 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -61,6 +61,8 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
+      - name: Fetch remote references
+        run: git fetch origin "+refs/heads/*:refs/remotes/origin/*"
       # Run build all the projects
       - run: yarn build --since=${{ env.NX_BASE_BRANCH }}
       # Check the types of the projects built via esbuild
@@ -85,6 +87,8 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
+      - name: Fetch remote references
+        run: git fetch origin "+refs/heads/*:refs/remotes/origin/*"
       - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
@@ -111,6 +115,8 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
+      - name: Fetch remote references
+        run: git fetch origin "+refs/heads/*:refs/remotes/origin/*"
       - name: Test worker and server
         run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3

From 62bb5bb4ff85ee59296b3e88492920d3e42346e1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 12:14:22 +0300
Subject: [PATCH 09/15] Fetch only required branch

---
 .github/workflows/budibase_ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 52bff87e0c..49d06fc430 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,7 +18,7 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  NX_BASE_BRANCH: origin/${{ github.base_ref || 'master'}}
+  NX_BASE_BRANCH: ${{ github.base_ref || 'master'}}
 
 jobs:
   lint:
@@ -62,7 +62,7 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - name: Fetch remote references
-        run: git fetch origin "+refs/heads/*:refs/remotes/origin/*"
+        run: git fetch origin ${{ env.NX_BASE_BRANCH }}
       # Run build all the projects
       - run: yarn build --since=${{ env.NX_BASE_BRANCH }}
       # Check the types of the projects built via esbuild
@@ -88,7 +88,7 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - name: Fetch remote references
-        run: git fetch origin "+refs/heads/*:refs/remotes/origin/*"
+        run: git fetch origin ${{ env.NX_BASE_BRANCH }}
       - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
@@ -116,7 +116,7 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - name: Fetch remote references
-        run: git fetch origin "+refs/heads/*:refs/remotes/origin/*"
+        run: git fetch origin ${{ env.NX_BASE_BRANCH }}
       - name: Test worker and server
         run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3

From 903b1eac09f7bdbdcaa788dcf767933469094306 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 12:27:14 +0300
Subject: [PATCH 10/15] Fetch-depth

---
 .github/workflows/budibase_ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 49d06fc430..b2e256b044 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -51,9 +51,12 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+          fetch-depth: 0
       - name: Checkout repo only
         uses: actions/checkout@v3
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
+        with:
+          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
@@ -61,8 +64,7 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - name: Fetch remote references
-        run: git fetch origin ${{ env.NX_BASE_BRANCH }}
+
       # Run build all the projects
       - run: yarn build --since=${{ env.NX_BASE_BRANCH }}
       # Check the types of the projects built via esbuild
@@ -77,9 +79,12 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+          fetch-depth: 0
       - name: Checkout repo only
         uses: actions/checkout@v3
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
+        with:
+          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
@@ -87,8 +92,6 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - name: Fetch remote references
-        run: git fetch origin ${{ env.NX_BASE_BRANCH }}
       - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3
         with:
@@ -105,9 +108,12 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+          fetch-depth: 0
       - name: Checkout repo only
         uses: actions/checkout@v3
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
+        with:
+          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
@@ -115,8 +121,6 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - name: Fetch remote references
-        run: git fetch origin ${{ env.NX_BASE_BRANCH }}
       - name: Test worker and server
         run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
       - uses: codecov/codecov-action@v3

From fc6472c0cccd6ad783232d32ed196ab289bee12a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 12:31:46 +0300
Subject: [PATCH 11/15] Prefix

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index b2e256b044..2953aa0575 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,7 +18,7 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  NX_BASE_BRANCH: ${{ github.base_ref || 'master'}}
+  NX_BASE_BRANCH: origin/${{ github.base_ref || 'master'}}
 
 jobs:
   lint:

From ee2f3e3157e81b9906225601d1fb48ca45d04be5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 8 Aug 2023 12:39:40 +0300
Subject: [PATCH 12/15] Fix build

---
 .github/workflows/budibase_ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 2953aa0575..cc1244e01a 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -138,6 +138,7 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
@@ -166,7 +167,7 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn build --projects=@budibase/server,@budibase/worker,@budibase/client
+      - run: yarn build --scope @budibase/server --scope @budibase/worker --scope @budibase/client
       - name: Run tests
         run: |
           cd qa-core

From 1c6b17ee326883aa3e4e545495210f411d1a287e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 9 Aug 2023 18:02:45 +0300
Subject: [PATCH 13/15] Use affected only on PRs, excluding master

---
 .github/workflows/budibase_ci.yml | 43 ++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index cc1244e01a..af135b757b 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -18,7 +18,8 @@ env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
   BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  NX_BASE_BRANCH: origin/${{ github.base_ref || 'master'}}
+  NX_BASE_BRANCH: origin/${{ github.base_ref }}
+  USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' && github.base_ref != 'master'}}
 
 jobs:
   lint:
@@ -66,9 +67,21 @@ jobs:
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
-      - run: yarn build --since=${{ env.NX_BASE_BRANCH }}
+      - name: Build
+        run: |
+          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+            yarn build --since=${{ env.NX_BASE_BRANCH }}
+          else
+            yarn build
+          fi
       # Check the types of the projects built via esbuild
-      - run: yarn check:types --since=${{ env.NX_BASE_BRANCH }}
+      - name: Check types
+        run: |
+          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+            yarn check:types --since=${{ env.NX_BASE_BRANCH }}
+          else
+            yarn check:types
+          fi
 
   test-libraries:
     runs-on: ubuntu-latest
@@ -92,7 +105,13 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
+      - name: Test
+        run: |
+          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+            yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
+          else
+            yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro
+          fi
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
@@ -122,7 +141,13 @@ jobs:
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - name: Test worker and server
-        run: yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
+        run: |
+          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+            yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
+          else
+            yarn test --scope=@budibase/worker --scope=@budibase/server
+          fi
+
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN || github.token }} # not required for public repos
@@ -146,7 +171,13 @@ jobs:
           node-version: 18.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn test --scope=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
+      - name: Test
+        run: |
+          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+            yarn test --scope=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
+          else
+            yarn test --scope=@budibase/pro
+          fi
 
   integration-test:
     runs-on: ubuntu-latest

From fb4b439f7b10f0c2a3ac7410e4158ca46f3080c0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 10 Aug 2023 11:10:47 +0300
Subject: [PATCH 14/15] Fix ifs

---
 .github/workflows/budibase_ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index af135b757b..a94c56407f 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -69,7 +69,7 @@ jobs:
       # Run build all the projects
       - name: Build
         run: |
-          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+          if ${{ env.USE_NX_AFFECTED }}; then
             yarn build --since=${{ env.NX_BASE_BRANCH }}
           else
             yarn build
@@ -77,7 +77,7 @@ jobs:
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |
-          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+          if ${{ env.USE_NX_AFFECTED }}; then
             yarn check:types --since=${{ env.NX_BASE_BRANCH }}
           else
             yarn check:types
@@ -107,7 +107,7 @@ jobs:
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
-          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+          if ${{ env.USE_NX_AFFECTED }}; then
             yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
           else
             yarn test --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/pro
@@ -142,7 +142,7 @@ jobs:
       - run: yarn --frozen-lockfile
       - name: Test worker and server
         run: |
-          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+          if ${{ env.USE_NX_AFFECTED }}; then
             yarn test --scope=@budibase/worker --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
           else
             yarn test --scope=@budibase/worker --scope=@budibase/server
@@ -173,7 +173,7 @@ jobs:
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
-          if [[ ${{ env.USE_NX_AFFECTED }} ]]; then
+          if ${{ env.USE_NX_AFFECTED }}; then
             yarn test --scope=@budibase/pro --since=${{ env.NX_BASE_BRANCH }}
           else
             yarn test --scope=@budibase/pro

From 97e64b88aabd7ac9367f8eaa3b7ded3e8e7a6cd2 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 10 Aug 2023 08:23:37 +0000
Subject: [PATCH 15/15] Bump version to 2.9.21-alpha.1

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index eb3f1bd6aa..a7edba2921 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.21-alpha.0",
+  "version": "2.9.21-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"