Commit044ebbb

authored

Merge branch 'main' into export-types

2 parents21446ed +6b5d3ea commit044ebbbCopy full SHA for 044ebbb

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ inputs:`
`29`	`29`	`retry-exempt-status-codes:`
`30`	`30`	description:A comma separated list of status codes that will NOT be retried e.g. "400,500". No effect unless `retries` is set
`31`	`31`	`default:400,401,403,404,422# from https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14`
	`32`	`+base-url:`
	`33`	`+description:An optional GitHub REST API URL to connect to a different GitHub instance. For example, https://my.github-enterprise-server.com/api/v3`
	`34`	`+required:false`
`32`	`35`	`outputs:`
`33`	`36`	`result:`
`34`	`37`	description:The return value of the script, stringified with `JSON.stringify`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15220,6 +15220,7 @@ async function main() {`
`15220`	`15220`	`const debug = core.getBooleanInput('debug');`
`15221`	`15221`	`const userAgent = core.getInput('user-agent');`
`15222`	`15222`	`const previews = core.getInput('previews');`
	`15223`	`+ const baseUrl = core.getInput('base-url');`
`15223`	`15224`	`const retries = parseInt(core.getInput('retries'));`
`15224`	`15225`	`const exemptStatusCodes = parseNumberArray(core.getInput('retry-exempt-status-codes'));`
`15225`	`15226`	`const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes, utils.defaults);`
`@@ -15228,7 +15229,8 @@ async function main() {`
`15228`	`15229`	`userAgent: userAgent \|\| undefined,`
`15229`	`15230`	`previews: previews ? previews.split(',') : undefined,`
`15230`	`15231`	`retry: retryOpts,`
`15231`		`- request: requestOpts`
	`15232`	`+ request: requestOpts,`
	`15233`	`+ baseUrl: baseUrl \|\| undefined`
`15232`	`15234`	`};`
`15233`	`15235`	`const github = (0,lib_github.getOctokit)(token, opts, plugin_retry_dist_node/* retry /.XD, dist_node/ requestLog */.g);`
`15234`	`15236`	`const script = core.getInput('script', { required: true });`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ main().catch(handleError)`
`18`	`18`	`typeOptions={`
`19`	`19`	`log?:Console`
`20`	`20`	`userAgent?:string`
	`21`	`+baseUrl?:string`
`21`	`22`	`previews?:string[]`
`22`	`23`	`retry?:RetryOptions`
`23`	`24`	`request?:RequestRequestOptions`
`@@ -28,6 +29,7 @@ async function main(): Promise<void> {`
`28`	`29`	`constdebug=core.getBooleanInput('debug')`
`29`	`30`	`constuserAgent=core.getInput('user-agent')`
`30`	`31`	`constpreviews=core.getInput('previews')`
	`32`	`+constbaseUrl=core.getInput('base-url')`
`31`	`33`	`constretries=parseInt(core.getInput('retries'))`
`32`	`34`	`constexemptStatusCodes=parseNumberArray(`
`33`	`35`	`core.getInput('retry-exempt-status-codes')`
`@@ -43,7 +45,8 @@ async function main(): Promise<void> {`
`43`	`45`	`userAgent:userAgent\|\|undefined,`
`44`	`46`	`previews:previews ?previews.split(',') :undefined,`
`45`	`47`	`retry:retryOpts,`
`46`		`-request:requestOpts`
	`48`	`+request:requestOpts,`
	`49`	`+baseUrl:baseUrl\|\|undefined`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`constgithub=getOctokit(token,opts,retry,requestLog)`

Comments

(0)