From 6269879b028c7c0eaf29a3fd718ee10bfcc41378 Mon Sep 17 00:00:00 2001 From: Barry Gordon Date: Tue, 8 Mar 2022 15:02:11 +0000 Subject: [PATCH] Avoid outputting two annotations in setFailed --- __tests__/main.test.ts | 7 +++++-- src/main.ts | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts index 5ea513c..62a9ada 100644 --- a/__tests__/main.test.ts +++ b/__tests__/main.test.ts @@ -29,6 +29,9 @@ describe('run', () => { process.env.GITHUB_ACTOR = 'dependabot[bot]' process.env.GITHUB_WORKSPACE = workspace + process.env.GITHUB_SERVER_URL = 'https://test.dev' + process.env.GITHUB_REPOSITORY = 'foo/bar' + markJobAsProcessedSpy = jest.spyOn( ApiClient.prototype, 'markJobAsProcessed' @@ -130,7 +133,7 @@ describe('run', () => { await run(context) expect(core.setFailed).toHaveBeenCalledWith( - new Error('unexpected error retrieving job params') + `Error: unexpected error retrieving job params\n\nFor more information see: https://test.dev/foo/bar/network/updates/1 (write access required)` ) }) @@ -159,7 +162,7 @@ describe('run', () => { await run(context) expect(core.setFailed).toHaveBeenCalledWith( - new Error('error getting job details') + `Error: error getting job details\n\nFor more information see: https://test.dev/foo/bar/network/updates/1 (write access required)` ) }) diff --git a/src/main.ts b/src/main.ts index 9517882..9c233a4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -130,14 +130,16 @@ function botSay(message: string): void { } function setFailed(message: string | Error): void { - core.setFailed(message) if (jobId) { - core.error( + message = [ + message, `For more information see: ${dependabotJobUrl( jobId )} (write access required)` - ) + ].join('\n\n') } + + core.setFailed(message) } function dependabotJobUrl(id: number): string {