From 3fb67ffe4feda02b1e45d655f61388ed487367c4 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 7 Sep 2023 10:42:07 +0100 Subject: [PATCH 01/11] Updating pro reference checking to work for master branch. --- .github/workflows/budibase_ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 3e4b2221d2..66fbd7abb2 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -225,10 +225,12 @@ jobs: echo "Running on branch '$branch' (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})" if [[ $branch == "master" ]]; then - base_commit=$(git rev-parse origin/master) + base_branch=master else - base_commit=$(git rev-parse origin/develop) + base_branch=develop fi + git fetch origin $base_branch + base_commit=$(git rev-parse $base_branch) echo "target_branch=$branch" echo "target_branch=$branch" >> "$GITHUB_OUTPUT" From ef9c0f7f042876ffed772008830f3c287a1d4ca0 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 7 Sep 2023 10:46:02 +0100 Subject: [PATCH 02/11] Pure git fetch for checking pro ref. --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 66fbd7abb2..579f656301 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -229,7 +229,7 @@ jobs: else base_branch=develop fi - git fetch origin $base_branch + git fetch base_commit=$(git rev-parse $base_branch) echo "target_branch=$branch" From f17a0acb17c335bda163748339b5c02fb6f7797c Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 7 Sep 2023 10:48:08 +0100 Subject: [PATCH 03/11] Better logging. --- .github/workflows/budibase_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 579f656301..4db4b3064c 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -229,7 +229,9 @@ jobs: else base_branch=develop fi + echo "Running git fetch" git fetch + echo "Running git rev-parse $base_branch" base_commit=$(git rev-parse $base_branch) echo "target_branch=$branch" From 25287173e25b0715215132c7b5774b38a50ebf18 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 7 Sep 2023 10:59:29 +0100 Subject: [PATCH 04/11] Switching to fetch-depth 0. --- .github/workflows/budibase_ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 4db4b3064c..d670e222d3 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -214,6 +214,7 @@ jobs: with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} + fetch-depth: 0 - name: Check pro commit id: get_pro_commits @@ -225,14 +226,10 @@ jobs: echo "Running on branch '$branch' (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})" if [[ $branch == "master" ]]; then - base_branch=master + base_commit=$(git rev-parse origin/master) else - base_branch=develop + base_commit=$(git rev-parse origin/develop) fi - echo "Running git fetch" - git fetch - echo "Running git rev-parse $base_branch" - base_commit=$(git rev-parse $base_branch) echo "target_branch=$branch" echo "target_branch=$branch" >> "$GITHUB_OUTPUT" @@ -255,4 +252,4 @@ jobs: process.exit(1); } else { console.log('All good, the submodule had been merged and setup correctly!') - } + } \ No newline at end of file From ee396b983b3637d1cf21d8a29e1d8ebd183e9cd8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Sep 2023 11:29:18 +0000 Subject: [PATCH 05/11] Bump version to 2.9.39 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index a662b691ed..9c5cd65aa0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.39-alpha.14", + "version": "2.9.39", "npmClient": "yarn", "packages": [ "packages/*" From 10e3cccb9f2bb004840f5c60f8bd111338d6609e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Sep 2023 13:33:53 +0000 Subject: [PATCH 06/11] Bump version to 2.10.0 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 9c5cd65aa0..fd2bdb2f65 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.39", + "version": "2.10.0", "npmClient": "yarn", "packages": [ "packages/*" From ab5753273ddebb9f7f68b538e517162f26bb88ef Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 7 Sep 2023 18:50:07 +0100 Subject: [PATCH 07/11] fix for legacy custom roles --- packages/server/src/sdk/app/permissions/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/sdk/app/permissions/index.ts b/packages/server/src/sdk/app/permissions/index.ts index b79bfeeb31..b2661b0f7e 100644 --- a/packages/server/src/sdk/app/permissions/index.ts +++ b/packages/server/src/sdk/app/permissions/index.ts @@ -92,7 +92,7 @@ export async function getResourcePerms( // update the various roleIds in the resource permissions for (let role of rolesList) { const rolePerms = allowsExplicitPerm - ? roles.checkForRoleResourceArray(role.permissions, resourceId) + ? roles.checkForRoleResourceArray(role.permissions || {}, resourceId) : {} if (rolePerms[resourceId]?.indexOf(level) > -1) { permissions[level] = { From b74814906851bed6853ccccf438a0c5e65bb91e1 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 7 Sep 2023 19:06:58 +0100 Subject: [PATCH 08/11] fix for app backups not being shown --- packages/builder/src/stores/portal/licensing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index 795616add1..3197822e53 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -107,7 +107,7 @@ export const createLicensingStore = () => { Constants.Features.USER_GROUPS ) const backupsEnabled = license.features.includes( - Constants.Features.BACKUPS + Constants.Features.APP_BACKUPS ) const scimEnabled = license.features.includes(Constants.Features.SCIM) const environmentVariablesEnabled = license.features.includes( From 3cec62b0c7672392a00f1ef4a014329cf03dad4f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Sep 2023 18:21:05 +0000 Subject: [PATCH 09/11] Bump version to 2.10.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index fd2bdb2f65..a346d18213 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.10.0", + "version": "2.10.1", "npmClient": "yarn", "packages": [ "packages/*" From fd023cf291e1dba7abb5643c15de5b52d318f150 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 8 Sep 2023 15:56:31 +0200 Subject: [PATCH 10/11] Add dist/plugins.js back --- packages/backend-core/scripts/build.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/scripts/build.js b/packages/backend-core/scripts/build.js index 9cc33d7b75..f84f22bf8d 100644 --- a/packages/backend-core/scripts/build.js +++ b/packages/backend-core/scripts/build.js @@ -1,4 +1,5 @@ #!/usr/bin/node const coreBuild = require("../../../scripts/build") +coreBuild("./src/plugin/index.ts", "./dist/plugins.js") coreBuild("./src/index.ts", "./dist/index.js") From d1d3dd3c378e055f180517b851c1bfd72f1b701b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Sep 2023 14:51:34 +0000 Subject: [PATCH 11/11] Bump version to 2.10.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index a346d18213..34dca0cd41 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.10.1", + "version": "2.10.2", "npmClient": "yarn", "packages": [ "packages/*"