From e7ab6f72f7982ff1031eba37b8cd19b85fe0a77d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 16 Dec 2021 11:04:27 +0000 Subject: [PATCH 01/24] v1.0.24 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 2d5e3c1efd..7c6b6f801a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.23", + "version": "1.0.24", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 7d360ce9fb..25a5a63691 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "1.0.23", + "version": "1.0.24", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c017bd8de5..cd2d027388 100644 --- 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.23", + "version": "1.0.24", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index b8b329a85a..77fdaa9f5c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.23", + "version": "1.0.24", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.23", - "@budibase/client": "^1.0.23", + "@budibase/bbui": "^1.0.24", + "@budibase/client": "^1.0.24", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.23", + "@budibase/string-templates": "^1.0.24", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a4d619ac2c..68551d8cd9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.23", + "version": "1.0.24", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 9b78f34089..74781039ec 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.23", + "version": "1.0.24", "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.23", + "@budibase/bbui": "^1.0.24", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.23", + "@budibase/string-templates": "^1.0.24", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 3e53763be7..0cbd44daa9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.23", + "version": "1.0.24", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -69,9 +69,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.23", - "@budibase/client": "^1.0.23", - "@budibase/string-templates": "^1.0.23", + "@budibase/auth": "^1.0.24", + "@budibase/client": "^1.0.24", + "@budibase/string-templates": "^1.0.24", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7816c22830..99d2f5729e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.23", + "version": "1.0.24", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 86b4841af5..41b40012ad 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.23", + "version": "1.0.24", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.23", - "@budibase/string-templates": "^1.0.23", + "@budibase/auth": "^1.0.24", + "@budibase/string-templates": "^1.0.24", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0", From 1a964f2122695ce46298d97ca98039a3dc0c0833 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 12:35:50 +0100 Subject: [PATCH 02/24] turn off release pipeline, update selfhost jobs --- .github/workflows/deploy-cloud.yaml | 3 ++- .github/workflows/release-selfhost.yml | 9 ++++----- .github/workflows/release.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 778029bf03..b7c4c8ae1c 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -29,7 +29,8 @@ jobs: release_version=$(cat lerna.json | jq -r '.version') echo "::set-output name=release_version::$release_version" - - uses: peymanmortazavi/eks-helm-deploy@v1 + - name: Deploy to EKS + uses: peymanmortazavi/eks-helm-deploy@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 933fee947c..e377407b1f 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -25,16 +25,15 @@ jobs: docker pull budibase/worker:$release_tag # Tag apps and worker images - docker tag budibase/apps:$release_tag $SELF_HOST_TAG - docker tag budibase/worker:$release_tag $SELF_HOST_TAG + docker tag budibase/apps:$release_tag latest + docker tag budibase/worker:$release_tag latest # Push images - docker push --all-tags budibase/apps - docker push --all-tags budibase/worker + docker push budibase/apps:latest + docker push budibase/worker:latest env: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - SELF_HOST_TAG: latest - name: Setup Helm uses: azure/setup-helm@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8768a01c78..46687ce0bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Budibase Release on: push: branches: - - master + - test env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} From 5c43042bf520605adfd85ca4d9979b89d43b3b95 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 12:44:11 +0100 Subject: [PATCH 03/24] tag docker images, change eks deploy action --- .github/workflows/deploy-cloud.yaml | 5 +++-- .github/workflows/release-selfhost.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index b7c4c8ae1c..a2cad316fd 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -30,13 +30,14 @@ jobs: echo "::set-output name=release_version::$release_version" - name: Deploy to EKS - uses: peymanmortazavi/eks-helm-deploy@v1 + uses: craftech-io/eks-helm-deploy-action@v1 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-access-key-id: ${{ secrets.AWS_ACCESS__KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: eu-west-1 cluster-name: budibase-eks-production config-files: values.production.yaml + chart-path: charts/budibase namespace: budibase values: appVersion=v${{ github.event.inputs.version || github.steps.version.outputs.release_version }} name: budibase-prod \ No newline at end of file diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index e377407b1f..1d1ee381be 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -29,8 +29,8 @@ jobs: docker tag budibase/worker:$release_tag latest # Push images - docker push budibase/apps:latest - docker push budibase/worker:latest + docker push --all-tags budibase/apps + docker push --all-tags budibase/apps env: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} From d5ee373450ae38f9a63fdad88dcc51209d9c30e0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 13:01:43 +0100 Subject: [PATCH 04/24] fix github curl to pull infra values.yaml --- .github/workflows/release-selfhost.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 1d1ee381be..2a31eccf2e 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -25,15 +25,16 @@ jobs: docker pull budibase/worker:$release_tag # Tag apps and worker images - docker tag budibase/apps:$release_tag latest - docker tag budibase/worker:$release_tag latest + docker tag budibase/apps:$release_tag budibase/apps:$SELFHOST_TAG + docker tag budibase/worker:$release_tag budibase/worker:$SELFHOST_TAG # Push images - docker push --all-tags budibase/apps - docker push --all-tags budibase/apps + docker push budibase/apps:$SELFHOST_TAG + docker push budibase/worker:$SELFHOST_TAG env: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} + SELFHOST_TAG: latest - name: Setup Helm uses: azure/setup-helm@v1 From 6d22067f877a704fc98d41281bc2f9429eea367c Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 13:09:21 +0100 Subject: [PATCH 05/24] removing git commit sha from curl --- .github/workflows/deploy-cloud.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index a2cad316fd..af6971c61c 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -16,7 +16,7 @@ jobs: - name: Pull values.yaml from budibase-infra run: | - curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ [c3a7a9d12] + curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ -H 'Accept: application/vnd.github.v3.raw' \ -o values.production.yaml \ -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml From 414a1b74d4d023a19da1559a47c8e5376d57f726 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 13:12:54 +0100 Subject: [PATCH 06/24] adding AWS creds configuration step --- .github/workflows/deploy-cloud.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index af6971c61c..1f99a2919e 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -25,9 +25,15 @@ jobs: if: ${{ !github.event.inputs.version }} id: version run: | - sudo apt-get install -y jq release_version=$(cat lerna.json | jq -r '.version') echo "::set-output name=release_version::$release_version" + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: eu-west-1 - name: Deploy to EKS uses: craftech-io/eks-helm-deploy-action@v1 From 3a0dac4292f7af1a325bf3738dd3c1764c7a04ea Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 13:38:21 +0100 Subject: [PATCH 07/24] correct version for cloud deploy, added helm chart automation to selfhost job --- .github/workflows/deploy-cloud.yaml | 13 ++++++---- .github/workflows/release-selfhost.yml | 34 +++++++++++++------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 1f99a2919e..0951a9d9e1 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -21,12 +21,15 @@ jobs: -o values.production.yaml \ -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml - - name: Get the latest budibase release version if not specifically set - if: ${{ !github.event.inputs.version }} + - name: Get the latest budibase release version id: version run: | - release_version=$(cat lerna.json | jq -r '.version') - echo "::set-output name=release_version::$release_version" + if [ ${{ github.event.inputs.version }} == '' ]; then + release_version=$(cat lerna.json | jq -r '.version') + else + release_version=${{ github.event.inputs.version }} + fi + echo "::set-output name=release_version::$release_version" - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 @@ -45,5 +48,5 @@ jobs: config-files: values.production.yaml chart-path: charts/budibase namespace: budibase - values: appVersion=v${{ github.event.inputs.version || github.steps.version.outputs.release_version }} + values: appVersion=v${{ github.steps.version.outputs.release_version }} name: budibase-prod \ No newline at end of file diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 2a31eccf2e..89edf9fb3b 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -40,21 +40,21 @@ jobs: 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 "<>" - # helm package charts/budibase - # git checkout gh-pages - # mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs - # git add -A - # git commit -m "Helm Release: ${{ github.steps.version.outputs.release_version }}" - # git push - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build and release helm chart + run: | + git config user.name "Budibase Helm Bot" + git config user.email "<>" + helm package charts/budibase + git checkout gh-pages + mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs + git add -A + git commit -m "Helm Release: ${{ github.steps.version.outputs.release_version }}" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: Perform github release - # run: | - # echo release - # env: - # GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file + - name: Perform Github Release + uses: softprops/action-gh-release@v1 + name: v${{ github.steps.version.outputs.release_version }} + with: + generate_release_notes: true \ No newline at end of file From 3a7bf6455e6d686d3ee1bf79029fed43b42947cc Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 13:40:17 +0100 Subject: [PATCH 08/24] workflow file --- .github/workflows/release-selfhost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 89edf9fb3b..2533e4c1aa 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -55,6 +55,6 @@ jobs: - name: Perform Github Release uses: softprops/action-gh-release@v1 - name: v${{ github.steps.version.outputs.release_version }} with: + name: v${{ github.steps.version.outputs.release_version }} generate_release_notes: true \ No newline at end of file From b04923d6d3618f45bec30e5394aa8583e735f0ec Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 14:17:36 +0100 Subject: [PATCH 09/24] index helm repo --- .github/workflows/release-selfhost.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 2533e4c1aa..b2ca69c27f 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -47,6 +47,7 @@ jobs: helm package charts/budibase git checkout gh-pages mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs + helm repo index docs git add -A git commit -m "Helm Release: ${{ github.steps.version.outputs.release_version }}" git push From e2e91a7bd50ed75dae8e88cbd436a9bcb6a7019a Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 14:31:40 +0100 Subject: [PATCH 10/24] inputting correct release version --- .github/workflows/deploy-cloud.yaml | 2 +- .github/workflows/release-selfhost.yml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 0951a9d9e1..7516409652 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -24,7 +24,7 @@ jobs: - name: Get the latest budibase release version id: version run: | - if [ ${{ github.event.inputs.version }} == '' ]; then + if [ -z "${{ github.event.inputs.version }}" ]; then release_version=$(cat lerna.json | jq -r '.version') else release_version=${{ github.event.inputs.version }} diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index b2ca69c27f..ff54d8081b 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -39,13 +39,16 @@ jobs: - name: Setup Helm uses: azure/setup-helm@v1 id: helm-install + run: helm package charts/budibase + - uses: actions/checkout@v2 + with: + ref: gh-pages + - name: Build and release helm chart run: | git config user.name "Budibase Helm Bot" git config user.email "<>" - helm package charts/budibase - git checkout gh-pages mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs helm repo index docs git add -A From 8056c1acbb05192d0b85227a86f6f0ba8c77b884 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 15:13:20 +0100 Subject: [PATCH 11/24] adding run command to package chart --- .github/workflows/release-selfhost.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index ff54d8081b..7fbdadadf4 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -39,11 +39,13 @@ jobs: - name: Setup Helm uses: azure/setup-helm@v1 id: helm-install - run: helm package charts/budibase + - run: helm package charts/budibase + - uses: actions/checkout@v2 with: ref: gh-pages + - name: Build and release helm chart run: | From 40e9790e5e224e1f0d13aac4b9e97ef920a2879d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 15:33:14 +0100 Subject: [PATCH 12/24] set appVersion at correct level --- .github/workflows/deploy-cloud.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 7516409652..5e722989ed 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -48,5 +48,5 @@ jobs: config-files: values.production.yaml chart-path: charts/budibase namespace: budibase - values: appVersion=v${{ github.steps.version.outputs.release_version }} + values: globals.appVersion=v${{ github.event.inputs.version }} name: budibase-prod \ No newline at end of file From 7ddfb517408f4a6681dcb1ce7ade8743c596229a Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 15:36:34 +0100 Subject: [PATCH 13/24] use github env rather than workflow outputs --- .github/workflows/deploy-cloud.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 5e722989ed..8e162441d2 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -29,7 +29,7 @@ jobs: else release_version=${{ github.event.inputs.version }} fi - echo "::set-output name=release_version::$release_version" + echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 @@ -48,5 +48,5 @@ jobs: config-files: values.production.yaml chart-path: charts/budibase namespace: budibase - values: globals.appVersion=v${{ github.event.inputs.version }} + values: globals.appVersion=v${{ env.RELEASE_VERSION }} name: budibase-prod \ No newline at end of file From 32d18087b6882fb2e4818634cbebde0f2bb4e22f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 16:04:08 +0100 Subject: [PATCH 14/24] word count to verify production yaml --- .github/workflows/deploy-cloud.yaml | 1 + .github/workflows/release-selfhost.yml | 35 +++++++++++++------------- .github/workflows/release.yml | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 8e162441d2..5444ae8e89 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -20,6 +20,7 @@ jobs: -H 'Accept: application/vnd.github.v3.raw' \ -o values.production.yaml \ -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml + wc -l values.production.yaml - name: Get the latest budibase release version id: version diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 7fbdadadf4..a7072b6891 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -17,7 +17,7 @@ jobs: # Get latest release version sudo apt-get install -y jq release_version=$(cat lerna.json | jq -r '.version') - echo "::set-output name=release_version::$release_version" + echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV release_tag=v$release_version # Pull apps and worker images @@ -40,27 +40,26 @@ jobs: uses: azure/setup-helm@v1 id: helm-install - - run: helm package charts/budibase + # - run: helm package charts/budibase - - uses: actions/checkout@v2 - with: - ref: gh-pages - + # - uses: actions/checkout@v2 + # with: + # ref: gh-pages - - name: Build and release helm chart - run: | - git config user.name "Budibase Helm Bot" - git config user.email "<>" - mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs - helm repo index docs - git add -A - git commit -m "Helm Release: ${{ github.steps.version.outputs.release_version }}" - git push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - 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 add -A + # git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}" + # git push + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Perform Github Release uses: softprops/action-gh-release@v1 with: - name: v${{ github.steps.version.outputs.release_version }} + name: v${{ env.RELEASE_VERSION }} generate_release_notes: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 46687ce0bc..3464e93da9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,10 +72,10 @@ jobs: # chart: charts/budibase # token: ${{ github.token }} # values: | - # appVersion: ${{ steps.previoustag.outputs.tag }} + # globals.appVersion: ${{ steps.previoustag.outputs.tag }} # value-files: >- # [ - # "values.preprod.yaml" + # "charts/budibase/values.yaml" # ] # env: # KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' From 9f5bc94b17228a5fe64578b8e7d8291a8c1ced39 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 17:14:28 +0100 Subject: [PATCH 15/24] use cross repo permissions token --- .github/workflows/deploy-cloud.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 5444ae8e89..ee86bb07ca 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -16,7 +16,7 @@ jobs: - name: Pull values.yaml from budibase-infra run: | - curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ -H 'Accept: application/vnd.github.v3.raw' \ -o values.production.yaml \ -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml From 375364784b1ab1f55fd3be2463f18b5c9f23d487 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 18:42:42 +0100 Subject: [PATCH 16/24] removing timeouts from app exports in cloud --- hosting/kubernetes/envoy/envoy.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hosting/kubernetes/envoy/envoy.yaml b/hosting/kubernetes/envoy/envoy.yaml index 25a774dc7e..bab1f25c02 100644 --- a/hosting/kubernetes/envoy/envoy.yaml +++ b/hosting/kubernetes/envoy/envoy.yaml @@ -50,6 +50,14 @@ static_resources: route: cluster: app-service + - match: + safe_regex: + google_re2: {} + regex: "/api/.*/export" + route: + timeout: 0s + cluster: app-service + - match: { path: "/api/deploy" } route: timeout: 60s From e9d44c7b479587ae45aab24f13b50f4f765d13c0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 16 Dec 2021 19:24:07 +0100 Subject: [PATCH 17/24] turning on prod deploy again, adding github release to selfhost job --- .github/workflows/release-selfhost.yml | 16 ++++++++++------ .github/workflows/release.yml | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index a7072b6891..9a6b75959a 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -9,6 +9,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + fetch_depth: 0 - name: Tag and release Docker images (Self Host) run: | @@ -39,12 +41,6 @@ jobs: - name: Setup Helm uses: azure/setup-helm@v1 id: helm-install - - # - run: helm package charts/budibase - - # - uses: actions/checkout@v2 - # with: - # ref: gh-pages # - name: Build and release helm chart # run: | @@ -52,12 +48,20 @@ jobs: # 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: Perform Github Release uses: softprops/action-gh-release@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3464e93da9..f6068fe8cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Budibase Release on: push: branches: - - test + - master env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} @@ -59,7 +59,7 @@ jobs: # - name: Pull values.yaml from budibase-infra # run: | - # curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ [c3a7a9d12] + # curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ [c3a7a9d12] # -H 'Accept: application/vnd.github.v3.raw' \ # -o values.preprod.yaml \ # -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml From ef4410229e26cce4e831e78500bac942dbe08605 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 16 Dec 2021 18:32:05 +0000 Subject: [PATCH 18/24] v1.0.25 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 7c6b6f801a..a20a306a2e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.24", + "version": "1.0.25", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 25a5a63691..137abf4426 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "1.0.24", + "version": "1.0.25", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cd2d027388..9414c6afd4 100644 --- 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.24", + "version": "1.0.25", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 77fdaa9f5c..99227ed494 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.24", + "version": "1.0.25", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.24", - "@budibase/client": "^1.0.24", + "@budibase/bbui": "^1.0.25", + "@budibase/client": "^1.0.25", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.24", + "@budibase/string-templates": "^1.0.25", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 68551d8cd9..cd8aefff20 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.24", + "version": "1.0.25", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 74781039ec..4a0a0e125b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.24", + "version": "1.0.25", "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.24", + "@budibase/bbui": "^1.0.25", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.24", + "@budibase/string-templates": "^1.0.25", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 0cbd44daa9..ae4dd8f3ff 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.24", + "version": "1.0.25", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -69,9 +69,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.24", - "@budibase/client": "^1.0.24", - "@budibase/string-templates": "^1.0.24", + "@budibase/auth": "^1.0.25", + "@budibase/client": "^1.0.25", + "@budibase/string-templates": "^1.0.25", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 99d2f5729e..da00e5f001 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.24", + "version": "1.0.25", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 41b40012ad..f1978e4f0a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.24", + "version": "1.0.25", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.24", - "@budibase/string-templates": "^1.0.24", + "@budibase/auth": "^1.0.25", + "@budibase/string-templates": "^1.0.25", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0", From 39116bc631577bd0b43b8b048d3b3c61fe6c8712 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 17 Dec 2021 14:58:03 +0100 Subject: [PATCH 19/24] testing selfhost job --- .github/workflows/deploy-cloud.yaml | 10 +++++++- .github/workflows/release-selfhost.yml | 2 +- .github/workflows/release.yml | 32 +++++++++++++------------- package.json | 2 +- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index ee86bb07ca..74693e3848 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -50,4 +50,12 @@ jobs: chart-path: charts/budibase namespace: budibase values: globals.appVersion=v${{ env.RELEASE_VERSION }} - name: budibase-prod \ No newline at end of file + name: budibase-prod + + - name: Discord Webhook Action + uses: tsickert/discord-webhook@v4.0.0 + with: + webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} + content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to budibase cloud." + embed-title: ${{ env.RELEASE_VERSION }} + diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 9a6b75959a..3e2e5ca6b7 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -17,7 +17,6 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD # Get latest release version - sudo apt-get install -y jq release_version=$(cat lerna.json | jq -r '.version') echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV release_tag=v$release_version @@ -66,4 +65,5 @@ jobs: uses: softprops/action-gh-release@v1 with: name: v${{ env.RELEASE_VERSION }} + tag_name: v${{ env.RELEASE_VERSION }} generate_release_notes: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6068fe8cd..1cd35e810b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Budibase Release on: push: branches: - - master + - test env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} @@ -64,18 +64,18 @@ jobs: # -o values.preprod.yaml \ # -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml - # - name: Deploy to Preprod Environment - # uses: deliverybot/helm@v1 - # with: - # release: budibase-preprod - # namespace: budibase - # chart: charts/budibase - # token: ${{ github.token }} - # values: | - # globals.appVersion: ${{ steps.previoustag.outputs.tag }} - # value-files: >- - # [ - # "charts/budibase/values.yaml" - # ] - # env: - # KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' + - name: Deploy to Preprod Environment + uses: deliverybot/helm@v1 + with: + release: budibase-preprod + namespace: budibase + chart: charts/budibase + token: ${{ github.token }} + values: | + globals.appVersion: ${{ steps.previoustag.outputs.tag }} + value-files: >- + [ + "charts/budibase/values.yaml" + ] + env: + KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' diff --git a/package.json b/package.json index 63de8251d4..93bf843622 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "build": "lerna run build", "publishdev": "lerna run publishdev", "publishnpm": "yarn build && lerna publish --force-publish", - "release": "yarn build && lerna publish patch --yes --force-publish", + "release": "lerna publish patch --yes --force-publish", "release:develop": "yarn build && lerna publish prerelease --yes --force-publish --dist-tag develop", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", From 44ea0dc0e376b26718305caaa151d73e49bbd06d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 17 Dec 2021 15:02:25 +0100 Subject: [PATCH 20/24] yaml definition for release job --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1cd35e810b..512432a3d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,7 +72,8 @@ jobs: chart: charts/budibase token: ${{ github.token }} values: | - globals.appVersion: ${{ steps.previoustag.outputs.tag }} + globals: + appVersion: ${{ steps.previoustag.outputs.tag }} value-files: >- [ "charts/budibase/values.yaml" From e086859c7a2f386f8d0c2135effc85b99b60ffde Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 17 Dec 2021 15:27:46 +0100 Subject: [PATCH 21/24] adding preprod deploy --- .github/workflows/deploy-cloud.yaml | 2 +- .github/workflows/release.yml | 9 ++++++++- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 74693e3848..26422a2e7b 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -56,6 +56,6 @@ jobs: uses: tsickert/discord-webhook@v4.0.0 with: webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} - content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to budibase cloud." + content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Cloud." embed-title: ${{ env.RELEASE_VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 512432a3d7..56c66603d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Budibase Release on: push: branches: - - test + - master env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} @@ -80,3 +80,10 @@ jobs: ] env: KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' + + - name: Discord Webhook Action + uses: tsickert/discord-webhook@v4.0.0 + with: + webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} + content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod." + embed-title: ${{ env.RELEASE_VERSION }} diff --git a/package.json b/package.json index 93bf843622..929576a691 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "publishdev": "lerna run publishdev", "publishnpm": "yarn build && lerna publish --force-publish", "release": "lerna publish patch --yes --force-publish", - "release:develop": "yarn build && lerna publish prerelease --yes --force-publish --dist-tag develop", + "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 2b5d1a105a1e004fd2eadba455a608e58a6f6317 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 17 Dec 2021 15:46:06 +0100 Subject: [PATCH 22/24] use standard values.yaml --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56c66603d4..12d3271237 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,10 +74,10 @@ jobs: values: | globals: appVersion: ${{ steps.previoustag.outputs.tag }} - value-files: >- - [ - "charts/budibase/values.yaml" - ] + # value-files: >- + # [ + # "charts/budibase/values.yaml" + # ] env: KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' From 50ae72b1f08efb505b94778e085834bf58be2392 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 17 Dec 2021 14:52:40 +0000 Subject: [PATCH 23/24] v1.0.26 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index a20a306a2e..fff668e69f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.25", + "version": "1.0.26", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 137abf4426..5a6c17e847 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "1.0.25", + "version": "1.0.26", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9414c6afd4..2e7aea7113 100644 --- 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.25", + "version": "1.0.26", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 99227ed494..4e06812dfd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.25", + "version": "1.0.26", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.25", - "@budibase/client": "^1.0.25", + "@budibase/bbui": "^1.0.26", + "@budibase/client": "^1.0.26", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.25", + "@budibase/string-templates": "^1.0.26", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index cd8aefff20..e82b9c0672 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.25", + "version": "1.0.26", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 4a0a0e125b..db44f8ea73 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.25", + "version": "1.0.26", "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.25", + "@budibase/bbui": "^1.0.26", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.25", + "@budibase/string-templates": "^1.0.26", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index ae4dd8f3ff..d2b76cb3bd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.25", + "version": "1.0.26", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -69,9 +69,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.25", - "@budibase/client": "^1.0.25", - "@budibase/string-templates": "^1.0.25", + "@budibase/auth": "^1.0.26", + "@budibase/client": "^1.0.26", + "@budibase/string-templates": "^1.0.26", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index da00e5f001..d81e207e48 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.25", + "version": "1.0.26", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index f1978e4f0a..12a3c959ab 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.25", + "version": "1.0.26", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.25", - "@budibase/string-templates": "^1.0.25", + "@budibase/auth": "^1.0.26", + "@budibase/string-templates": "^1.0.26", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0", From 89ce9c8e88d2dfb80f89671cc22c387e419c84d0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 20 Dec 2021 08:52:16 +0000 Subject: [PATCH 24/24] preprod job for testing in isolation --- .github/workflows/deploy-preprod.yml | 59 ++++++++++++++++++++++++++++ .github/workflows/release.yml | 46 +++++++++++----------- 2 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/deploy-preprod.yml diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml new file mode 100644 index 0000000000..ce789e71ec --- /dev/null +++ b/.github/workflows/deploy-preprod.yml @@ -0,0 +1,59 @@ +name: Budibase Release Preprod + +on: + workflow_dispatch: + +env: + POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} + INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} + POSTHOG_URL: ${{ secrets.POSTHOG_URL }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: eu-west-1 + + - name: 'Get Previous tag' + id: previoustag + uses: "WyriHaximus/github-action-get-previous-tag@v1" + + # - name: Pull values.yaml from budibase-infra + # run: | + # curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ [c3a7a9d12] + # -H 'Accept: application/vnd.github.v3.raw' \ + # -o values.preprod.yaml \ + # -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml + + - name: Deploy to Preprod Environment + uses: deliverybot/helm@v1 + with: + release: budibase-preprod + namespace: budibase + chart: charts/budibase + token: ${{ github.token }} + values: | + globals: + appVersion: ${{ steps.previoustag.outputs.tag }} + # value-files: >- + # [ + # "charts/budibase/values.yaml" + # ] + env: + KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' + + - name: Discord Webhook Action + uses: tsickert/discord-webhook@v4.0.0 + with: + webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} + content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod." + embed-title: ${{ env.RELEASE_VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12d3271237..859d89f18b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Budibase Release on: push: branches: - - master + - test env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} @@ -64,26 +64,26 @@ jobs: # -o values.preprod.yaml \ # -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml - - name: Deploy to Preprod Environment - uses: deliverybot/helm@v1 - with: - release: budibase-preprod - namespace: budibase - chart: charts/budibase - token: ${{ github.token }} - values: | - globals: - appVersion: ${{ steps.previoustag.outputs.tag }} - # value-files: >- - # [ - # "charts/budibase/values.yaml" - # ] - env: - KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' + # - name: Deploy to Preprod Environment + # uses: deliverybot/helm@v1 + # with: + # release: budibase-preprod + # namespace: budibase + # chart: charts/budibase + # token: ${{ github.token }} + # values: | + # globals: + # appVersion: ${{ steps.previoustag.outputs.tag }} + # # value-files: >- + # # [ + # # "charts/budibase/values.yaml" + # # ] + # env: + # KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' - - name: Discord Webhook Action - uses: tsickert/discord-webhook@v4.0.0 - with: - webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} - content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod." - embed-title: ${{ env.RELEASE_VERSION }} + # - name: Discord Webhook Action + # uses: tsickert/discord-webhook@v4.0.0 + # with: + # webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} + # content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod." + # embed-title: ${{ env.RELEASE_VERSION }}