From d87714107dbd2a8c4b65a4997cd5050e61ef5b20 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 13 Apr 2022 21:13:01 +0100 Subject: [PATCH] Add checkout pro step to budibase-ci --- .github/workflows/budibase_ci.yml | 5 +++++ package.json | 3 +-- packages/server/src/middleware/authorized.ts | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index cb27b30f3f..26720a5cc2 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -22,6 +22,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 + with: + repository: budibase/budibase-pro + path: './pro' - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 diff --git a/package.json b/package.json index 091f523b25..cdded06773 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,7 @@ }, "scripts": { "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "yarn run pre-bootstrap && lerna link && lerna bootstrap", - "pre-bootstrap": "./scripts/link-dependencies.sh", + "bootstrap": "lerna link && lerna bootstrap && ./scripts/link-dependencies.sh", "build": "lerna run build", "publishnpm": "yarn build && lerna publish --force-publish", "release": "lerna publish patch --yes --force-publish", diff --git a/packages/server/src/middleware/authorized.ts b/packages/server/src/middleware/authorized.ts index 272af7999c..298a50988a 100644 --- a/packages/server/src/middleware/authorized.ts +++ b/packages/server/src/middleware/authorized.ts @@ -88,8 +88,8 @@ export = (permType: any, permLevel: any = null, opts = { schema: false }) => await builderMiddleware(ctx, permType) // get the resource roles - let resourceRoles = [], - otherLevelRoles + let resourceRoles: any = [] + let otherLevelRoles: any = [] const otherLevel = permLevel === PermissionLevels.READ ? PermissionLevels.WRITE