mirror of
https://github.com/gradle/actions.git
synced 2025-08-18 06:31:28 +08:00
Remove direct use of octokit/request-error (#632)
This commit is contained in:
parent
755ed7db09
commit
39dddb8ae7
1
sources/package-lock.json
generated
1
sources/package-lock.json
generated
@ -18,7 +18,6 @@
|
||||
"@actions/glob": "0.5.0",
|
||||
"@actions/http-client": "2.2.3",
|
||||
"@actions/tool-cache": "2.0.2",
|
||||
"@octokit/request-error": "5.1.1",
|
||||
"@octokit/webhooks-types": "7.6.1",
|
||||
"cheerio": "1.0.0",
|
||||
"semver": "7.7.1",
|
||||
|
@ -40,7 +40,6 @@
|
||||
"@actions/glob": "0.5.0",
|
||||
"@actions/http-client": "2.2.3",
|
||||
"@actions/tool-cache": "2.0.2",
|
||||
"@octokit/request-error": "5.1.1",
|
||||
"@octokit/webhooks-types": "7.6.1",
|
||||
"cheerio": "1.0.0",
|
||||
"semver": "7.7.1",
|
||||
|
@ -3,7 +3,6 @@ import * as github from '@actions/github'
|
||||
import * as glob from '@actions/glob'
|
||||
import {DefaultArtifactClient} from '@actions/artifact'
|
||||
import {GitHub} from '@actions/github/lib/utils'
|
||||
import {RequestError} from '@octokit/request-error'
|
||||
import type {PullRequestEvent} from '@octokit/webhooks-types'
|
||||
|
||||
import * as path from 'path'
|
||||
@ -191,7 +190,7 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
|
||||
try {
|
||||
await submitDependencyGraphFile(dependencyGraphFile)
|
||||
} catch (error) {
|
||||
if (error instanceof RequestError) {
|
||||
if (error instanceof Error && error.name === 'HttpError') {
|
||||
error.message = translateErrorMessage(dependencyGraphFile, error)
|
||||
}
|
||||
throw error
|
||||
@ -199,7 +198,7 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
|
||||
}
|
||||
}
|
||||
|
||||
function translateErrorMessage(jsonFile: string, error: RequestError): string {
|
||||
function translateErrorMessage(jsonFile: string, error: Error): string {
|
||||
const relativeJsonFile = getRelativePathFromWorkspace(jsonFile)
|
||||
const mainWarning = `Dependency submission failed for ${relativeJsonFile}.\n${error.message}`
|
||||
if (error.message === 'Resource not accessible by integration') {
|
||||
|
@ -1,6 +1,5 @@
|
||||
import * as core from '@actions/core'
|
||||
import * as github from '@actions/github'
|
||||
import {RequestError} from '@octokit/request-error'
|
||||
|
||||
import {BuildResults, BuildResult} from './build-results'
|
||||
import {SummaryConfig, getActionId, getGithubToken} from './configuration'
|
||||
@ -66,7 +65,7 @@ ${jobSummary}`
|
||||
body: prComment
|
||||
})
|
||||
} catch (error) {
|
||||
if (error instanceof RequestError) {
|
||||
if (error instanceof Error && error.name === 'HttpError') {
|
||||
core.warning(buildWarningMessage(error))
|
||||
} else {
|
||||
throw error
|
||||
@ -74,7 +73,7 @@ ${jobSummary}`
|
||||
}
|
||||
}
|
||||
|
||||
function buildWarningMessage(error: RequestError): string {
|
||||
function buildWarningMessage(error: Error): string {
|
||||
const mainWarning = `Failed to generate PR comment.\n${String(error)}`
|
||||
if (error.message === 'Resource not accessible by integration') {
|
||||
return `${mainWarning}
|
||||
|
Loading…
x
Reference in New Issue
Block a user