From 5489a25fabe3b95a9ca8397ed844583232673863 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 16:59:09 +0100
Subject: [PATCH 1/8] Lint action

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 77867c8617..818fb07145 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -62,7 +62,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -98,7 +98,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -133,7 +133,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -169,7 +169,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -200,7 +200,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -227,7 +227,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From 44c436c25b4333e75c7e56d01dd300c72055c5ec Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:08:41 +0100
Subject: [PATCH 2/8] Unify checkouts

---
 .github/workflows/budibase_ci.yml | 57 +++++++------------------------
 1 file changed, 13 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 818fb07145..3aad335ddf 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -19,20 +19,17 @@ env:
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   NX_BASE_BRANCH: origin/${{ github.base_ref }}
   USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' }}
+  IS_OSS_CONTRIBUTOR: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase' }}
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
@@ -45,18 +42,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
           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
@@ -81,18 +72,12 @@ jobs:
   test-libraries:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
           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
@@ -116,18 +101,12 @@ jobs:
   test-worker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
           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
@@ -152,18 +131,12 @@ jobs:
   test-server:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
           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
@@ -213,15 +186,11 @@ jobs:
   integration-test:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

From 40ff3b88afae3baaf3d51bb2579f81214b9808df Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:15:54 +0100
Subject: [PATCH 3/8] Conditional cache

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 3aad335ddf..c731e8f4c7 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -112,7 +112,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -142,7 +142,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -173,7 +173,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -196,7 +196,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: yarn
+          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From 1641b5a18e380852dd130eee0415d681cdacb560 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:16:36 +0100
Subject: [PATCH 4/8] Fix condition

---
 .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 c731e8f4c7..3109183989 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -19,7 +19,7 @@ env:
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   NX_BASE_BRANCH: origin/${{ github.base_ref }}
   USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' }}
-  IS_OSS_CONTRIBUTOR: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase' }}
+  IS_OSS_CONTRIBUTOR: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase' }}
 
 jobs:
   lint:

From bdc297d4eca37dd5d320dda93481cbc33df348a0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:29:13 +0100
Subject: [PATCH 5/8] Fix

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 3109183989..3960ce09e6 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -112,7 +112,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -142,7 +142,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -173,7 +173,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -196,7 +196,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ !env.is_oss_contributor && 'yarn' || '' }}
+          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From e78a68fb031f7f102dc0feb1577779010533ee1c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:35:26 +0100
Subject: [PATCH 6/8] Fix

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 3960ce09e6..e8133dd1ce 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -28,14 +28,14 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -75,7 +75,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -104,7 +104,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -112,7 +112,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -134,7 +134,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -142,7 +142,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -173,7 +173,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -189,14 +189,14 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ !env.IS_OSS_CONTRIBUTOR }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.is_oss_contributor == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From 52f2e5633c2d5f0e1115904afb6ed42163125197 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:41:07 +0100
Subject: [PATCH 7/8] Fixes

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index e8133dd1ce..d68e9d4aa1 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -28,14 +28,14 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -75,7 +75,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -104,7 +104,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -112,7 +112,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -134,7 +134,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
@@ -142,7 +142,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -173,7 +173,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -189,14 +189,14 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
         with:
-          submodules: ${{ env.IS_OSS_CONTRIBUTOR == false }}
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == false && 'yarn' || '' }}
+          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From 347b6ccd4e865f8ff0e7116fd59576e465851ce2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 17 Nov 2023 17:44:50 +0100
Subject: [PATCH 8/8] Fix yarn version

---
 .github/workflows/budibase_ci.yml | 14 +++++++-------
 scripts/syncProPackage.js         |  9 +--------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index d68e9d4aa1..cb71d0702b 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -112,7 +112,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -142,7 +142,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -173,7 +173,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -196,7 +196,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }}
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker
diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js
index 46a55c291b..14ee222ce7 100755
--- a/scripts/syncProPackage.js
+++ b/scripts/syncProPackage.js
@@ -5,14 +5,7 @@ const { execSync } = require("child_process")
 let version = "0.0.0"
 const localPro = fs.existsSync("packages/pro/src")
 if (!localPro) {
-  const branchName = execSync("git rev-parse --abbrev-ref HEAD")
-    .toString()
-    .trim()
-  if (branchName === "master") {
-    version = "latest"
-  } else {
-    version = "develop"
-  }
+  version = "latest"
 }
 
 // Get the list of workspaces with mismatched dependencies