actions/checkout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added pathname to url-helper

Browse Source
This commit is contained in:
Michael Schmidt
2023-07-10 15:37:44 +02:00
parent 016e95b24b
commit be5e352fa7
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dist/index.js vendored
View File

@@ -36008,17 +36008,14 @@ function getFetchUrl(settings) {
return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git`;
}
// "origin" is SCHEME://HOSTNAME[:PORT]
return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`;
return `${serviceUrl.origin}${serviceUrl.pathname}${encodedOwner}/${encodedName}`;
}
exports.getFetchUrl = getFetchUrl;
function getServerUrl() {
// todo: remove GITHUB_URL after support for GHES Alpha is no longer needed
// return new URL(
// process.env['GITHUB_SERVER_URL'] + '/gitea' ||
// process.env['GITHUB_URL'] + '/gitea' ||
// 'https://github.com'
// )
return new url_1.URL('https://dev.hargassner.at/gitea');
return new url_1.URL(process.env['GITHUB_SERVER_URL'] ||
process.env['GITHUB_URL'] ||
'https://github.com');
}
exports.getServerUrl = getServerUrl;

13
src/url-helper.ts
View File

@@ -16,15 +16,14 @@ export function getFetchUrl(settings: IGitSourceSettings): string {
}
// "origin" is SCHEME://HOSTNAME[:PORT]
return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`
return `${serviceUrl.origin}${serviceUrl.pathname}${encodedOwner}/${encodedName}`
}
export function getServerUrl(): URL {
// todo: remove GITHUB_URL after support for GHES Alpha is no longer needed
// return new URL(
// process.env['GITHUB_SERVER_URL'] + '/gitea' ||
// process.env['GITHUB_URL'] + '/gitea' ||
// 'https://github.com'
// )
return new URL('https://dev.hargassner.at/gitea')
return new URL(
process.env['GITHUB_SERVER_URL'] ||
process.env['GITHUB_URL'] ||
'https://github.com'
)
}