mirror of
https://github.com/actions/github-script.git
synced 2026-02-08 03:57:27 +00:00
Default to server URL explicitly
This commit is contained in:
parent
ec76ce579c
commit
4cc0320b36
2 changed files with 6 additions and 19 deletions
12
dist/index.js
vendored
12
dist/index.js
vendored
|
|
@ -35500,7 +35500,7 @@ async function main() {
|
||||||
const debug = core.getBooleanInput('debug');
|
const debug = core.getBooleanInput('debug');
|
||||||
const userAgent = core.getInput('user-agent');
|
const userAgent = core.getInput('user-agent');
|
||||||
const previews = core.getInput('previews');
|
const previews = core.getInput('previews');
|
||||||
// const baseUrl = core.getInput('base-url')
|
const baseUrl = core.getInput('base-url');
|
||||||
const retries = parseInt(core.getInput('retries'));
|
const retries = parseInt(core.getInput('retries'));
|
||||||
const exemptStatusCodes = parseNumberArray(core.getInput('retry-exempt-status-codes'));
|
const exemptStatusCodes = parseNumberArray(core.getInput('retry-exempt-status-codes'));
|
||||||
const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes, utils.defaults);
|
const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes, utils.defaults);
|
||||||
|
|
@ -35509,15 +35509,9 @@ async function main() {
|
||||||
userAgent: userAgent || undefined,
|
userAgent: userAgent || undefined,
|
||||||
previews: previews ? previews.split(',') : undefined,
|
previews: previews ? previews.split(',') : undefined,
|
||||||
retry: retryOpts,
|
retry: retryOpts,
|
||||||
request: requestOpts
|
request: requestOpts,
|
||||||
|
baseUrl: baseUrl || lib_github.context.serverUrl
|
||||||
};
|
};
|
||||||
// Testing without base URL entirely.
|
|
||||||
// if (baseUrl) {
|
|
||||||
// debug && console.log(`Using custom base URL: ${baseUrl}`)
|
|
||||||
// opts.baseUrl = baseUrl
|
|
||||||
// } else {
|
|
||||||
// debug && console.log('Using default base URL')
|
|
||||||
// }
|
|
||||||
const github = (0,lib_github.getOctokit)(token, opts, plugin_retry_dist_node.retry, dist_node.requestLog);
|
const github = (0,lib_github.getOctokit)(token, opts, plugin_retry_dist_node.retry, dist_node.requestLog);
|
||||||
const script = core.getInput('script', { required: true });
|
const script = core.getInput('script', { required: true });
|
||||||
// Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors.
|
// Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors.
|
||||||
|
|
|
||||||
13
src/main.ts
13
src/main.ts
|
|
@ -28,7 +28,7 @@ async function main(): Promise<void> {
|
||||||
const debug = core.getBooleanInput('debug')
|
const debug = core.getBooleanInput('debug')
|
||||||
const userAgent = core.getInput('user-agent')
|
const userAgent = core.getInput('user-agent')
|
||||||
const previews = core.getInput('previews')
|
const previews = core.getInput('previews')
|
||||||
// const baseUrl = core.getInput('base-url')
|
const baseUrl = core.getInput('base-url')
|
||||||
const retries = parseInt(core.getInput('retries'))
|
const retries = parseInt(core.getInput('retries'))
|
||||||
const exemptStatusCodes = parseNumberArray(
|
const exemptStatusCodes = parseNumberArray(
|
||||||
core.getInput('retry-exempt-status-codes')
|
core.getInput('retry-exempt-status-codes')
|
||||||
|
|
@ -44,17 +44,10 @@ async function main(): Promise<void> {
|
||||||
userAgent: userAgent || undefined,
|
userAgent: userAgent || undefined,
|
||||||
previews: previews ? previews.split(',') : undefined,
|
previews: previews ? previews.split(',') : undefined,
|
||||||
retry: retryOpts,
|
retry: retryOpts,
|
||||||
request: requestOpts
|
request: requestOpts,
|
||||||
|
baseUrl: baseUrl || context.serverUrl
|
||||||
}
|
}
|
||||||
|
|
||||||
// Testing without base URL entirely.
|
|
||||||
// if (baseUrl) {
|
|
||||||
// debug && console.log(`Using custom base URL: ${baseUrl}`)
|
|
||||||
// opts.baseUrl = baseUrl
|
|
||||||
// } else {
|
|
||||||
// debug && console.log('Using default base URL')
|
|
||||||
// }
|
|
||||||
|
|
||||||
const github = getOctokit(token, opts, retry, requestLog)
|
const github = getOctokit(token, opts, retry, requestLog)
|
||||||
const script = core.getInput('script', {required: true})
|
const script = core.getInput('script', {required: true})
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue