Merge branch 'develop' into fix/return-url

.github/workflows/release-selfhost.yml

@@ -9,10 +9,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v1
         with: 
           node-version: 14.x
+          fetch_depth: 0
 
       - name: Tag and release Docker images (Self Host)
         run: | 
@@ -39,11 +38,6 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           SELFHOST_TAG: latest
       
-      - name: Setup Helm
-        uses: azure/setup-helm@v1
-        id: helm-install
-
-<<<<<<< HEAD
       - name: Build CLI executables
         run: |
           pushd packages/cli
@@ -51,26 +45,10 @@ jobs:
           yarn build
           popd
       
-      # - name: Build and release helm chart
+      - name: Setup Helm 
-      #   run: |
+        uses: azure/setup-helm@v1
-      #     git config user.name "Budibase Helm Bot"
+        id: helm-install
-      #     git config user.email "<>"
-      #     mv budibase-${{ env.RELEASE_VERSION }}.tgz docs
-      #     helm repo index docs
-      #     git checkout gh-pages
-      #     git add -A
-      #     git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
-      #     git push
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Deploy
-      #   uses: peaceiris/actions-gh-pages@v3
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-      #     publish_dir: ./public
-      #     full_commit_message: "Helm Release: ${{ env.RELEASE_VERSION }}"
-=======
       - name: Build and release helm chart
         run: | 
           git config user.name "Budibase Helm Bot"
@@ -85,7 +63,6 @@ jobs:
           git push
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> 157877a60444104d17efedf937bc7d48fc3006c5
 
       - name: Perform Github Release
         uses: softprops/action-gh-release@v1

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.27-alpha.13",
+    "@budibase/bbui": "^1.0.27-alpha.15",
-    "@budibase/client": "^1.0.27-alpha.13",
+    "@budibase/client": "^1.0.27-alpha.15",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.27-alpha.13",
+    "@budibase/string-templates": "^1.0.27-alpha.15",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.27-alpha.13",
+    "@budibase/bbui": "^1.0.27-alpha.15",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.27-alpha.13",
+    "@budibase/string-templates": "^1.0.27-alpha.15",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.27-alpha.13",
+    "@budibase/backend-core": "^1.0.27-alpha.15",
-    "@budibase/client": "^1.0.27-alpha.13",
+    "@budibase/client": "^1.0.27-alpha.15",
-    "@budibase/string-templates": "^1.0.27-alpha.13",
+    "@budibase/string-templates": "^1.0.27-alpha.15",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.27-alpha.13",
+    "@budibase/backend-core": "^1.0.27-alpha.15",
-    "@budibase/string-templates": "^1.0.27-alpha.13",
+    "@budibase/string-templates": "^1.0.27-alpha.15",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",