From 2178f2b509d6ccfc7643746a4ee0715b1e3ecba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Walther?= Date: Fri, 24 Feb 2023 11:12:53 +0100 Subject: [PATCH] Github Actions: fix notification display issue --- .../support-files/network-explorer/templates/failure | 5 +++++ .../support-files/network-explorer/templates/success | 6 ++++++ .github/workflows/support-files/nightly/index.js | 2 +- .../workflows/support-files/nightly/templates/failure | 6 ++++++ .../workflows/support-files/nightly/templates/success | 8 +++++++- .../notifications/send_message_to_matrix.js | 5 ++++- .../support-files/nym-connect/templates/failure | 5 +++++ .../support-files/nym-connect/templates/success | 5 +++++ .../support-files/nym-wallet/templates/failure | 5 +++++ .../support-files/nym-wallet/templates/success | 9 +++++++-- .github/workflows/support-files/package.json | 1 + .../support-files/ts-packages/templates/failure | 5 +++++ .../support-files/ts-packages/templates/success | 10 ++++++++-- 13 files changed, 65 insertions(+), 7 deletions(-) diff --git a/.github/workflows/support-files/network-explorer/templates/failure b/.github/workflows/support-files/network-explorer/templates/failure index adc2896ace..0db23cefaa 100644 --- a/.github/workflows/support-files/network-explorer/templates/failure +++ b/.github/workflows/support-files/network-explorer/templates/failure @@ -1,9 +1,14 @@ 🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > 🔴 **FAILURE** :cry: +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message: ``` diff --git a/.github/workflows/support-files/network-explorer/templates/success b/.github/workflows/support-files/network-explorer/templates/success index 1f380b79b9..69dd64e140 100644 --- a/.github/workflows/support-files/network-explorer/templates/success +++ b/.github/workflows/support-files/network-explorer/templates/success @@ -1,10 +1,16 @@ 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 > :rocket: {{ env.NYM_PROJECT_NAME }} ➡️➡️➡️➡️➡️ **View output:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/ +> > `storybook`: https://{{ env.NYM_CI_WWW_LOCATION_STORYBOOK }}.{{ env.NYM_CI_WWW_BASE }} +> > ✅ **SUCCESS** +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}: ``` diff --git a/.github/workflows/support-files/nightly/index.js b/.github/workflows/support-files/nightly/index.js index 3bf2516092..913aa0e7c5 100644 --- a/.github/workflows/support-files/nightly/index.js +++ b/.github/workflows/support-files/nightly/index.js @@ -151,7 +151,7 @@ async function getMessageBody(context) { return `${icon} ${job.conclusion}: ${job.name} - ${job.html_url}`; }) // and join with newlines for display in the template - .join('\n'); + .join('\n\n'); return template({ ...context, jobResults }); } diff --git a/.github/workflows/support-files/nightly/templates/failure b/.github/workflows/support-files/nightly/templates/failure index 01ad9e7a00..1a8272b6c3 100644 --- a/.github/workflows/support-files/nightly/templates/failure +++ b/.github/workflows/support-files/nightly/templates/failure @@ -1,9 +1,15 @@ 🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > 🔴 **FAILURE** :cry: +> > `when` {{ timestamp }} +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> {{ jobResults }} diff --git a/.github/workflows/support-files/nightly/templates/success b/.github/workflows/support-files/nightly/templates/success index 064d1ccd36..8901076548 100644 --- a/.github/workflows/support-files/nightly/templates/success +++ b/.github/workflows/support-files/nightly/templates/success @@ -1,9 +1,15 @@ 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > ✅ **SUCCESS** +> > `when` {{ timestamp }} +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> -{{ jobResults }} \ No newline at end of file +{{ jobResults }} diff --git a/.github/workflows/support-files/notifications/send_message_to_matrix.js b/.github/workflows/support-files/notifications/send_message_to_matrix.js index aabd1d57aa..002af92350 100644 --- a/.github/workflows/support-files/notifications/send_message_to_matrix.js +++ b/.github/workflows/support-files/notifications/send_message_to_matrix.js @@ -5,6 +5,7 @@ const localStorage = new LocalStorage('./scratch'); const { LocalStorageCryptoStore, } = require('matrix-js-sdk/lib/crypto/store/localStorage-crypto-store'); +var showdown = require('showdown'); // hide all matrix client output console.error = (error) => console.log('❌ error: ', error); @@ -54,7 +55,9 @@ function createClient(context, room, message) { } async function sendMatrixMessage(contextArg, messageAsMarkdown, roomId) { - const client = createClient(contextArg, roomId, messageAsMarkdown); + const converter = new showdown.Converter(); + const messageAsHtml = converter.makeHtml(messageAsMarkdown); + const client = createClient(contextArg, roomId, messageAsHtml); await client.initCrypto(); await client.startClient({ initialSyncLimit: 1 }); } diff --git a/.github/workflows/support-files/nym-connect/templates/failure b/.github/workflows/support-files/nym-connect/templates/failure index adc2896ace..0db23cefaa 100644 --- a/.github/workflows/support-files/nym-connect/templates/failure +++ b/.github/workflows/support-files/nym-connect/templates/failure @@ -1,9 +1,14 @@ 🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > 🔴 **FAILURE** :cry: +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message: ``` diff --git a/.github/workflows/support-files/nym-connect/templates/success b/.github/workflows/support-files/nym-connect/templates/success index dbd26d69b8..4b547cb375 100644 --- a/.github/workflows/support-files/nym-connect/templates/success +++ b/.github/workflows/support-files/nym-connect/templates/success @@ -1,9 +1,14 @@ 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 > :rocket: {{ env.NYM_PROJECT_NAME }} ➡️➡️➡️➡️➡️ **View storybook:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/ +> > ✅ **SUCCESS** +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}: ``` diff --git a/.github/workflows/support-files/nym-wallet/templates/failure b/.github/workflows/support-files/nym-wallet/templates/failure index adc2896ace..0db23cefaa 100644 --- a/.github/workflows/support-files/nym-wallet/templates/failure +++ b/.github/workflows/support-files/nym-wallet/templates/failure @@ -1,9 +1,14 @@ 🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > 🔴 **FAILURE** :cry: +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message: ``` diff --git a/.github/workflows/support-files/nym-wallet/templates/success b/.github/workflows/support-files/nym-wallet/templates/success index 826f75e977..49f7787042 100644 --- a/.github/workflows/support-files/nym-wallet/templates/success +++ b/.github/workflows/support-files/nym-wallet/templates/success @@ -1,13 +1,18 @@ 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > ✅ **SUCCESS** - +> > ➡️➡️➡️➡️➡️ **View output:** +> > `storybook`: https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }} - +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}: ``` diff --git a/.github/workflows/support-files/package.json b/.github/workflows/support-files/package.json index 801d8e9bdd..01470a49b9 100644 --- a/.github/workflows/support-files/package.json +++ b/.github/workflows/support-files/package.json @@ -17,6 +17,7 @@ "remark-emoji": "^2.2.0", "remark-html": "^13.0.2", "remark-parse": "^9.0.0", + "showdown": "^2.1.0", "to-vfile": "^6.1.0", "unified": "^9.2.2" }, diff --git a/.github/workflows/support-files/ts-packages/templates/failure b/.github/workflows/support-files/ts-packages/templates/failure index adc2896ace..0db23cefaa 100644 --- a/.github/workflows/support-files/ts-packages/templates/failure +++ b/.github/workflows/support-files/ts-packages/templates/failure @@ -1,9 +1,14 @@ 🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > 🔴 **FAILURE** :cry: +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message: ``` diff --git a/.github/workflows/support-files/ts-packages/templates/success b/.github/workflows/support-files/ts-packages/templates/success index bab42a29f8..48da9fee60 100644 --- a/.github/workflows/support-files/ts-packages/templates/success +++ b/.github/workflows/support-files/ts-packages/templates/success @@ -1,14 +1,20 @@ 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 > :rocket: {{ env.NYM_PROJECT_NAME }} +> > ✅ **SUCCESS** - +> > ➡️➡️➡️➡️➡️ **View output:** +> > `storybook`: https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }} +> > `example`: https://{{ env.NYM_CI_WWW_LOCATION }}-example.{{ env.NYM_CI_WWW_BASE }} - +> > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }} +> > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }} +> > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }} +> Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}: ```