Merge branch 'master' into develop

2021-12-13 17:38:13 +01:00 · 2021-12-13 17:38:13 +01:00 · e1fcf40084
parent 2565d5476f b3591a1631
commit e1fcf40084
15 changed files with 85 additions and 1701 deletions
--- a/.github/workflows/release-charts.yml
+++ b/.github/workflows/release-charts.yml
@ -0,0 +1,36 @@
+name: Budibase Release Helm Charts
+
+on:
+ workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+      
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      - run: yarn release:helm
+        env:
+          BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
+
+      - name: Configure Git
+        run: |
+          git config user.name "Budibase Helm Bot"
+          git config user.email "<>"
+      
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.2.1
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@ -1,4 +1,4 @@
-name: Budibase Release Selfhost
+name: Budibase Release Docker Selfhost

 on:
 workflow_dispatch:
@ -43,19 +43,3 @@ jobs:
          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
          BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
          
-      - uses: azure/setup-helm@v1
-        id: install
-
-      - run: yarn release:helm
-        env:
-          BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
-
-      - name: Configure Git
-        run: |
-          git config user.name "Budibase Helm Bot"
-          git config user.email "<>"
-      
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.2.0
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/index.yaml
+++ b/index.yaml
@ -0,0 +1,3 @@
+apiVersion: v1
+entries: {}
+generated: "2021-12-13T12:46:40.291206+01:00"
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "license": "GPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.15-alpha.1",
-    "@budibase/client": "^1.0.15-alpha.1",
+    "@budibase/bbui": "^1.0.18",
+    "@budibase/client": "^1.0.18",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.15-alpha.1",
+    "@budibase/string-templates": "^1.0.18",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "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.15-alpha.1",
+    "@budibase/bbui": "^1.0.18",
    "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.15-alpha.1",
+    "@budibase/string-templates": "^1.0.18",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "description": "Budibase Web Server",
  "main": "src/index.ts",
  "repository": {
@ -69,10 +69,9 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/auth": "^1.0.15-alpha.1",
-    "@budibase/client": "^1.0.15-alpha.1",
-    "@budibase/string-templates": "^1.0.15-alpha.1",
+    "@budibase/auth": "^1.0.18",
+    "@budibase/client": "^1.0.18",
+    "@budibase/string-templates": "^1.0.18",
    "@bull-board/api": "^3.7.0",
    "@bull-board/koa": "^3.7.0",
    "@elastic/elasticsearch": "7.10.0",
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@ -8251,11 +8251,6 @@ lodash.flatten@^4.4.0:
  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=

-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.isarguments@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@ -12480,17 +12475,6 @@ yn@3.1.1:
  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==

-z-schema@^5.0.1:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.2.tgz#f410394b2c9fcb9edaf6a7511491c0bb4e89a504"
-  integrity sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==
-  dependencies:
-    lodash.get "^4.4.2"
-    lodash.isequal "^4.5.0"
-    validator "^13.7.0"
-  optionalDependencies:
-    commander "^2.7.1"
-
 zlib@1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0"
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.18",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -29,8 +29,8 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@budibase/auth": "^1.0.15-alpha.1",
-    "@budibase/string-templates": "^1.0.15-alpha.1",
+    "@budibase/auth": "^1.0.18",
+    "@budibase/string-templates": "^1.0.18",
    "@koa/router": "^8.0.0",
    "@sentry/node": "^6.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock