Skip to content

Draft: Fix API URL on GHES #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joshmgross wants to merge 11 commits into from
Closed

Draft: Fix API URL on GHES #437

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4793596
Add integration test to validate `base-url`
joshmgross Nov 16, 2023
8df72cd
Fix URLs in base url integration test
joshmgross Nov 16, 2023
b7d983c
Remove trailing `/` from inputs
joshmgross Nov 16, 2023
0a6deda
Fix bash script
joshmgross Nov 16, 2023
28e4318
Only set base URL when input is defined
joshmgross Nov 16, 2023
df3133d
Add debug logging for base URL
joshmgross Nov 16, 2023
98dabfb
Try without base-url entirely
joshmgross Nov 16, 2023
ec76ce5
Include GraphQL URL validations
joshmgross Nov 16, 2023
4cc0320
Default to server URL explicitly
joshmgross Nov 16, 2023
85717e4
Use API URL instead of Server URL
joshmgross Nov 16, 2023
d09af74
Avoid setting baseURL if the input is not provided
joshmgross Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Avoid setting baseURL if the input is not provided
  • Loading branch information
@joshmgross
joshmgross committed Nov 17, 2023
commit d09af7480d77adef3b450bc1a2bb0d3a1d62e272
6 changes: 4 additions & 2 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35509,9 +35509,11 @@ async function main() {
userAgent: userAgent || undefined,
previews: previews ? previews.split(',') : undefined,
retry: retryOpts,
request: requestOpts,
baseUrl: baseUrl || lib_github.context.apiUrl
request: requestOpts
};
if (baseUrl) {
opts.baseUrl = baseUrl;
}
const github = (0,lib_github.getOctokit)(token, opts, plugin_retry_dist_node.retry, dist_node.requestLog);
const script = core.getInput('script', { required: true });
// Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors.
Expand Down
7 changes: 5 additions & 2 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ async function main(): Promise<void> {
userAgent: userAgent || undefined,
previews: previews ? previews.split(',') : undefined,
retry: retryOpts,
request: requestOpts,
baseUrl: baseUrl || context.apiUrl
request: requestOpts
}

if (baseUrl) {
opts.baseUrl = baseUrl
}

const github = getOctokit(token, opts, retry, requestLog)
Expand Down