From 9b814e8231347d6588dbefddf324e68b5298b0ff Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 14 Aug 2023 17:32:03 +0100 Subject: [PATCH 1/7] updating build script to get QA core working again --- scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index b93ae1bbe6..f0a5966535 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -25,10 +25,10 @@ function runBuild(entry, outfile) { if (!fs.existsSync("../pro/src")) { // If we don't have pro, we cannot bundle backend-core. // Otherwise, the main context will not be shared between libraries - delete tsconfigPathPluginContent.compilerOptions.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths[ "@budibase/backend-core" ] - delete tsconfigPathPluginContent.compilerOptions.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths[ "@budibase/backend-core/*" ] } From e7fd37c156719b2bc219a0c42e3dc0c522ed1eba Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 14 Aug 2023 16:32:30 +0000 Subject: [PATCH 2/7] Bump version to 2.9.24 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0df96afd31..4e08cb9459 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.23", + "version": "2.9.24", "npmClient": "yarn", "packages": [ "packages/*" From b80c7d7fabab8ef41825c6c1a1147644cf1b1217 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 14 Aug 2023 17:44:24 +0100 Subject: [PATCH 3/7] add paths to the optional chaining --- scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index f0a5966535..3d1f65ff76 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -25,10 +25,10 @@ function runBuild(entry, outfile) { if (!fs.existsSync("../pro/src")) { // If we don't have pro, we cannot bundle backend-core. // Otherwise, the main context will not be shared between libraries - delete tsconfigPathPluginContent?.compilerOptions?.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths?.[ "@budibase/backend-core" ] - delete tsconfigPathPluginContent?.compilerOptions?.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths?.[ "@budibase/backend-core/*" ] } From f487a4d3caf938ac2beb2da9bdc6811c4dbf5d53 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 14 Aug 2023 16:46:07 +0000 Subject: [PATCH 4/7] Bump version to 2.9.25 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 4e08cb9459..7f64cf74d1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.24", + "version": "2.9.25", "npmClient": "yarn", "packages": [ "packages/*" From 658675553874bfded29aace5bf4b1b632d76d351 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 14 Aug 2023 18:16:40 +0100 Subject: [PATCH 5/7] remove special chars from access and secret key in dynamo lib --- .../src/integrations/validators/dynamodb.integration.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa-core/src/integrations/validators/dynamodb.integration.spec.ts b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts index c885f64213..d1cec7bca1 100644 --- a/qa-core/src/integrations/validators/dynamodb.integration.spec.ts +++ b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts @@ -28,8 +28,8 @@ describe("datasource validators", () => { 8000 )}`, } - env._set("AWS_ACCESS_KEY_ID", "mocked_key") - env._set("AWS_SECRET_ACCESS_KEY", "mocked_secret") + env._set("AWS_ACCESS_KEY_ID", "mockedkey") + env._set("AWS_SECRET_ACCESS_KEY", "mockedsecret") }) it("test valid connection string", async () => { From 6436aefa339ff61bac464738f93e2d032c6604cf Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 14 Aug 2023 17:25:15 +0000 Subject: [PATCH 6/7] Bump version to 2.9.26-alpha.0 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7f64cf74d1..369927cfdd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.25", + "version": "2.9.26-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" From a5f8d9994b957d48141b7882f55a77949bb26a39 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Tue, 15 Aug 2023 10:59:46 +0100 Subject: [PATCH 7/7] adoptjdk repo has changed to adoptium (#11521) --- hosting/couchdb/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index 70b4413859..ce77002052 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -5,11 +5,11 @@ ENV COUCHDB_PASSWORD admin EXPOSE 5984 RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - && \ apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ - apt-add-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \ - apt-get update && apt-get install -y --no-install-recommends adoptopenjdk-8-hotspot && \ + apt-add-repository 'deb https://packages.adoptium.net/artifactory/deb bullseye main' && \ + apt-get update && apt-get install -y --no-install-recommends temurin-8-jdk && \ rm -rf /var/lib/apt/lists/ # setup clouseau