From da3e78a37fe5e58ac5a0369a768ae744f6f78165 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 22 Apr 2022 10:16:09 +0100
Subject: [PATCH 1/2] Pro build fixes

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 scripts/pro/install.sh       |  2 ++
 scripts/pro/release.sh       | 18 +++++++++++-------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index c37ac9b276..b68cd2a94f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.105-alpha.27",
     "@budibase/client": "^1.0.105-alpha.27",
-    "@budibase/pro": "1.0.105-alpha.25",
+    "@budibase/pro": "1.0.105-alpha.27",
     "@budibase/string-templates": "^1.0.105-alpha.27",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0907c2adce..a0650c28f8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@budibase/backend-core": "^1.0.105-alpha.27",
     "@budibase/string-templates": "^1.0.105-alpha.27",
-    "@budibase/pro": "1.0.105-alpha.25",
+    "@budibase/pro": "1.0.105-alpha.27",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",
diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh
index cff90bffdc..ffa123a821 100755
--- a/scripts/pro/install.sh
+++ b/scripts/pro/install.sh
@@ -1,3 +1,5 @@
+#!/bin/bash 
+
 if [[ -z "${CI}" ]]; then
   echo 'Cannot run insall.sh unless in CI'
   exit 0
diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh
index 09e68f5b45..6839c9eaa0 100755
--- a/scripts/pro/release.sh
+++ b/scripts/pro/release.sh
@@ -1,19 +1,23 @@
-if [[ -z "${CI}" ]]; then
-  echo 'Cannot run release.sh unless in CI'
-  exit 0
-fi
+#!/bin/bash 
+
+# if [[ -z "${CI}" ]]; then
+#   echo 'Cannot run release.sh unless in CI'
+#   exit 0
+# fi
 
 # Release pro as same version as budibase
 VERSION=$(jq -r .version lerna.json)
+echo "Version: $VERSION"
+COMMAND=$1
+echo "Command: $COMMAND"
 
 # Go to pro package
 cd ../budibase-pro
 
 # Install NPM credentials
-echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
+# echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
 
 # Determine tag to use
-COMMAND=$1
 TAG=""
 if [[ $COMMAND == "develop" ]]
 then
@@ -24,7 +28,7 @@ fi
 
 echo "Releasing version $VERSION"
 echo "Releasing tag $TAG"
-lerna publish $VERSION --yes --force-publish --dist-tag $TAG
+# lerna publish $VERSION --yes --force-publish --dist-tag $TAG
 
 cd -
 

From 87540b065e3aab32a232e657a9e7f16ba763a7a1 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 22 Apr 2022 10:21:47 +0100
Subject: [PATCH 2/2] Uncomment release script

---
 scripts/pro/release.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh
index 6839c9eaa0..120b83f863 100755
--- a/scripts/pro/release.sh
+++ b/scripts/pro/release.sh
@@ -1,9 +1,9 @@
 #!/bin/bash 
 
-# if [[ -z "${CI}" ]]; then
-#   echo 'Cannot run release.sh unless in CI'
-#   exit 0
-# fi
+if [[ -z "${CI}" ]]; then
+  echo 'Cannot run release.sh unless in CI'
+  exit 0
+fi
 
 # Release pro as same version as budibase
 VERSION=$(jq -r .version lerna.json)
@@ -15,7 +15,7 @@ echo "Command: $COMMAND"
 cd ../budibase-pro
 
 # Install NPM credentials
-# echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
+echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
 
 # Determine tag to use
 TAG=""
@@ -28,7 +28,7 @@ fi
 
 echo "Releasing version $VERSION"
 echo "Releasing tag $TAG"
-# lerna publish $VERSION --yes --force-publish --dist-tag $TAG
+lerna publish $VERSION --yes --force-publish --dist-tag $TAG
 
 cd -