From 1106b2a3f0eb5745782a02f8d45684092bad8ea0 Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Wed, 25 Nov 2020 20:28:18 +0900 Subject: [PATCH] fix: Cannot read property header or footer (#328) Fixes for #327 * build: add pre-release and remove-pre-release --- Makefile | 11 +++++++++++ src/main.ts | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e43db7cb..56cae83e 100644 --- a/Makefile +++ b/Makefile @@ -20,3 +20,14 @@ test: .PHONY: all all: docker-compose run --rm -T dev npm run all + +.PHONY: pre-release +pre-release: + npm run build + git add ./lib/index.js + git commit -m "chore: npm run build" + +.PHONY: remove-pre-release +remove-pre-release: + git rm -f ./lib/index.js + git commit -m "chore: remove lib/index.js" diff --git a/src/main.ts b/src/main.ts index 525e43af..e02d15ce 100644 --- a/src/main.ts +++ b/src/main.ts @@ -118,9 +118,9 @@ export async function run(): Promise { const logURL = `${process.env['GITHUB_SERVER_URL']}/${process.env['GITHUB_REPOSITORY']}/actions/runs/${process.env['GITHUB_RUN_ID']}`; // Merge comment body - const commentMain = config.labels[labelIndex][`${labelEvent}`][`${eventType}`].body + '\n\n'; - const commentHeader = config.comment.header + '\n\n'; - const commentFooter = config.comment.footer + '\n\n'; + const commentMain = config.labels[labelIndex][`${labelEvent}`][`${eventType}`].body; + const commentHeader = config.comment?.header ?? ''; + const commentFooter = config.comment?.footer ?? ''; const commentFooterLinks = `
` + `Log` + @@ -128,11 +128,15 @@ export async function run(): Promise { `Bot Usage` + `
\n` + '\n\n'; - const rawCommentBody = commentHeader + commentMain + commentFooter + commentFooterLinks; + const rawCommentBody = `${commentHeader}\n\n${commentMain}\n\n${commentFooter}\n\n${commentFooterLinks}`; if (commentMain === '' || commentMain === void 0) { core.info(`[INFO] no configuration ${parentFieldName}.body`); } else { + groupConsoleLog('commentMain', commentMain, core.isDebug()); + groupConsoleLog('commentHeader', commentHeader, core.isDebug()); + groupConsoleLog('commentFooter', commentFooter, core.isDebug()); + groupConsoleLog('commentFooterLinks', commentFooterLinks, core.isDebug()); groupConsoleLog('rawCommentBody', rawCommentBody, core.isDebug()); }