Merge branch 'master' into fix-oracle-parse

packages/backend-core/tests/core/utilities/structures/koa.ts

@@ -2,7 +2,7 @@ import { createMockContext, createMockCookies } from "@shopify/jest-koa-mocks"
 import { BBContext } from "@budibase/types"
 
 export const newContext = (): BBContext => {
-  const ctx = createMockContext()
+  const ctx = createMockContext() as any
   return {
     ...ctx,
     path: "/",

scripts/deploy-camunda.sh

@@ -25,8 +25,10 @@ zbctl deploy resource onboarding.bpmn --insecure
 zbctl deploy resource free_trial.bpmn --insecure
 zbctl deploy resource verify_sso_login.bpmn --insecure
 
-cd ../../../../../budibase/packages/account-portal/packages/server 
+cd ../../../../../budibase/packages/pro
+yarn && yarn build
 
+cd ../account-portal/packages/server 
 yarn worker:run & cd ../../../.. && yarn dev:accountportal