From f499de643ab74075e7c431d936ae42c53c0bafc3 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 20 May 2022 16:47:09 +0100 Subject: [PATCH 1/3] merging report inline HTML, fixing webhook to prevent 400s from discord --- .github/workflows/smoke_test.yaml | 6 +++--- package.json | 2 +- packages/builder/package.json | 5 +++-- packages/builder/reporterConfig.json | 4 ++-- packages/builder/scripts/cypressResultsWebhook.js | 15 +++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml index 09da7ec44e..7002c8335b 100644 --- a/.github/workflows/smoke_test.yaml +++ b/.github/workflows/smoke_test.yaml @@ -41,12 +41,12 @@ jobs: - uses: actions/upload-artifact@v3 with: name: Test Reports - path: packages/builder/cypress/reports/mocha + path: packages/builder/cypress/reports/testReport.html - name: Cypress Discord Notify - run: yarn test:e2e:ci:report + run: yarn test:e2e:ci:notify env: CYPRESS_WEBHOOK_URL: ${{ secrets.BUDI_QA_WEBHOOK }} CYPRESS_OUTCOME: ${{ steps.cypress.outcome }} CYPRESS_DASHBOARD_URL: ${{ steps.cypress.outputs.dashboardUrl }} - GITHUB_RUN_URL: ${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }} + GITHUB_RUN_URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID diff --git a/package.json b/package.json index 28d234ee89..bd71dd6bc7 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "test:e2e": "lerna run cy:test --stream", "test:e2e:ci": "lerna run cy:ci --stream", "test:e2e:ci:record": "lerna run cy:ci:record --stream", - "test:e2e:ci:report": "lerna run cy:ci:report", + "test:e2e:ci:notify": "lerna run cy:ci:notify", "build:specs": "lerna run specs", "build:docker": "lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -", "build:docker:proxy": "docker build hosting/proxy -t proxy-service", diff --git a/packages/builder/package.json b/packages/builder/package.json index 91be8932c9..a21c9bb274 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -17,8 +17,9 @@ "cy:run:ci:record": "xvfb-run cypress run --headed --browser chrome --record", "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run", "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci", - "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record", - "cy:ci:report": "node scripts/cypressResultsWebhook", + "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record && npm run cy:ci:report", + "cy:ci:report": "mochawesome-merge cypress/reports/*.json > cypress/reports/testReport.json && marge cypress/reports/testReport.json --reportDir cypress/reports --inline", + "cy:ci:notify": "node scripts/cypressResultsWebhook", "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open", "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:open" }, diff --git a/packages/builder/reporterConfig.json b/packages/builder/reporterConfig.json index a3b713a3cd..2c2ef7c138 100644 --- a/packages/builder/reporterConfig.json +++ b/packages/builder/reporterConfig.json @@ -1,10 +1,10 @@ { "reporterEnabled": "mochawesome", "mochawesomeReporterOptions": { - "reportDir": "cypress/reports/mocha", + "reportDir": "cypress/reports", "quiet": true, "overwrite": false, - "html": true, + "html": false, "json": true } } \ No newline at end of file diff --git a/packages/builder/scripts/cypressResultsWebhook.js b/packages/builder/scripts/cypressResultsWebhook.js index f224664120..457093e013 100644 --- a/packages/builder/scripts/cypressResultsWebhook.js +++ b/packages/builder/scripts/cypressResultsWebhook.js @@ -2,7 +2,7 @@ const fetch = require("node-fetch") const path = require("path") -const { merge } = require("mochawesome-merge") +const fs = require("fs") const WEBHOOK_URL = process.env.CYPRESS_WEBHOOK_URL const OUTCOME = process.env.CYPRESS_OUTCOME @@ -17,11 +17,10 @@ async function generateReport() { "..", "cypress", "reports", - "mocha", - "*.json" + "testReport.json" ) - const testReport = await merge({ files: [REPORT_PATH] }) - return testReport + const report = fs.readFileSync(REPORT_PATH, "utf-8") + return JSON.parse(report) } async function discordCypressResultsNotification(report) { @@ -66,7 +65,7 @@ async function discordCypressResultsNotification(report) { fields: [ { name: "Commit", - value: GIT_SHA || "None Supplied", + value: `https://github.com/Budibase/budibase/commit/${GIT_SHA}`, }, { name: "Cypress Dashboard URL", @@ -74,7 +73,7 @@ async function discordCypressResultsNotification(report) { }, { name: "Github Actions Run URL", - value: GITHUB_ACTIONS_RUN_URL, + value: GITHUB_ACTIONS_RUN_URL || "None Supplied", }, { name: "Test Suites", @@ -106,7 +105,7 @@ async function discordCypressResultsNotification(report) { }, { name: "Pass Percentage", - value: passPercent, + value: Math.floor(passPercent), }, ], }, From 32f125944de336332ea67ad5e5c46b37b4b28ba1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 20 May 2022 15:56:52 +0000 Subject: [PATCH 2/3] v1.0.167-alpha.8 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index d065df1b12..8f68c88cd1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 94acb23298..54c0b4af17 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 98852ef0ea..86c1258e69 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.167-alpha.7", + "version": "1.0.167-alpha.8", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.167-alpha.7", + "@budibase/string-templates": "^1.0.167-alpha.8", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3f828eb47e..999de12d99 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.167-alpha.7", - "@budibase/client": "^1.0.167-alpha.7", - "@budibase/frontend-core": "^1.0.167-alpha.7", - "@budibase/string-templates": "^1.0.167-alpha.7", + "@budibase/bbui": "^1.0.167-alpha.8", + "@budibase/client": "^1.0.167-alpha.8", + "@budibase/frontend-core": "^1.0.167-alpha.8", + "@budibase/string-templates": "^1.0.167-alpha.8", "@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 2f372829b5..0fbc5422a2 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "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 48f28e6cbb..794fef2c15 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "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.167-alpha.7", - "@budibase/frontend-core": "^1.0.167-alpha.7", - "@budibase/string-templates": "^1.0.167-alpha.7", + "@budibase/bbui": "^1.0.167-alpha.8", + "@budibase/frontend-core": "^1.0.167-alpha.8", + "@budibase/string-templates": "^1.0.167-alpha.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index cf742f3c67..56cb0ed958 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.167-alpha.7", + "@budibase/bbui": "^1.0.167-alpha.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 56c11ea6a6..5dbaffe28f 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.167-alpha.7", + "version": "1.0.167-alpha.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -69,10 +69,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.167-alpha.7", - "@budibase/client": "^1.0.167-alpha.7", + "@budibase/backend-core": "^1.0.167-alpha.8", + "@budibase/client": "^1.0.167-alpha.8", "@budibase/pro": "1.0.167-alpha.7", - "@budibase/string-templates": "^1.0.167-alpha.7", + "@budibase/string-templates": "^1.0.167-alpha.8", "@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 9ddb29cefa..f94cf031a4 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.167-alpha.7", + "version": "1.0.167-alpha.8", "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 5b6d25049d..8db82005d1 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.167-alpha.7", + "version": "1.0.167-alpha.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.167-alpha.7", + "@budibase/backend-core": "^1.0.167-alpha.8", "@budibase/pro": "1.0.167-alpha.7", - "@budibase/string-templates": "^1.0.167-alpha.7", + "@budibase/string-templates": "^1.0.167-alpha.8", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 23223c17ec41c5a9d09bd446712e98d977f08465 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 20 May 2022 15:58:12 +0000 Subject: [PATCH 3/3] Update pro version to 1.0.167-alpha.8 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5dbaffe28f..6216ee48d3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -71,7 +71,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.167-alpha.8", "@budibase/client": "^1.0.167-alpha.8", - "@budibase/pro": "1.0.167-alpha.7", + "@budibase/pro": "1.0.167-alpha.8", "@budibase/string-templates": "^1.0.167-alpha.8", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8db82005d1..ee391811f9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.167-alpha.8", - "@budibase/pro": "1.0.167-alpha.7", + "@budibase/pro": "1.0.167-alpha.8", "@budibase/string-templates": "^1.0.167-alpha.8", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",