Merge branch 'develop' into fix/return-url

2024-07-03 21:40:55 +12:00 · 2022-01-13 14:36:59 +00:00 · 2022-01-13 14:36:59 +00:00 · 3d7923cb16
parent b12f7fa6f4 a268431fa9
commit 3d7923cb16
10 changed files with 29 additions and 52 deletions
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@ -9,13 +9,12 @@ jobs:

    steps:
      - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v1
-        with:
+        with: 
          node-version: 14.x
+          fetch_depth: 0

      - name: Tag and release Docker images (Self Host)
-        run: |
+        run: | 
          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD

          # Get latest release version
@ -30,7 +29,7 @@ jobs:
          # Tag apps and worker images
          docker tag budibase/apps:$release_tag budibase/apps:$SELFHOST_TAG
          docker tag budibase/worker:$release_tag budibase/worker:$SELFHOST_TAG
-
+          
          # Push images
          docker push budibase/apps:$SELFHOST_TAG
          docker push budibase/worker:$SELFHOST_TAG
@ -38,39 +37,18 @@ jobs:
          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
          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
          yarn
          yarn build
          popd
+      
+      - name: Setup Helm 
+        uses: azure/setup-helm@v1
+        id: helm-install

-      # - name: Build and release helm chart
-      #   run: |
-      #     git config user.name "Budibase Helm Bot"
-      #     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
@ -96,4 +73,4 @@ jobs:
          files: |
            packages/cli/build/cli-win.exe
            packages/cli/build/cli-linux
-            packages/cli/build/cli-macos
+            packages/cli/build/cli-macos 
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.27-alpha.13",
+  "version": "1.0.27-alpha.15",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/backend-core/package.json
+++ b/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",
--- 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.27-alpha.13",
+  "version": "1.0.27-alpha.15",
  "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.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/client": "^1.0.27-alpha.13",
+    "@budibase/bbui": "^1.0.27-alpha.15",
+    "@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",
--- a/packages/cli/package.json
+++ b/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": {
--- a/packages/client/package.json
+++ b/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"
--- a/packages/server/package.json
+++ b/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/client": "^1.0.27-alpha.13",
-    "@budibase/string-templates": "^1.0.27-alpha.13",
+    "@budibase/backend-core": "^1.0.27-alpha.15",
+    "@budibase/client": "^1.0.27-alpha.15",
+    "@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",
--- a/packages/string-templates/package.json
+++ b/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",
--- a/packages/worker/package.json
+++ b/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/string-templates": "^1.0.27-alpha.13",
+    "@budibase/backend-core": "^1.0.27-alpha.15",
+    "@budibase/string-templates": "^1.0.27-alpha.15",
    "@koa/router": "^8.0.0",
    "@sentry/node": "^6.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",