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

getFetchUrl: compose url with full service url

Browse Source 
actions/checkout maybe used by Gitea, which allows installing the
server instance in a subdirectory to the service root, therefore a full
serviceUrl must be used.

Signed-off-by: You-Sheng Yang <vicamo@gmail.com>
This commit is contained in:
You-Sheng Yang 2024-03-22 00:02:33 +08:00
parent cd7d8d697e
commit 9b92a3558d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/index.js vendored
View File

@ -2402,8 +2402,7 @@ function getFetchUrl(settings) {
if (settings.sshKey) { if (settings.sshKey) {
return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git`; return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git`;
} }
// "origin" is SCHEME://HOSTNAME[:PORT] return `${serviceUrl}/${encodedOwner}/${encodedName}`;
return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`;
} }
exports.getFetchUrl = getFetchUrl; exports.getFetchUrl = getFetchUrl;
function getServerUrl(url) { function getServerUrl(url) {

3
src/url-helper.ts
View File

@ -15,8 +15,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string {
return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git` return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git`
} }
// "origin" is SCHEME://HOSTNAME[:PORT] return `${serviceUrl}/${encodedOwner}/${encodedName}`
return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`
} }
export function getServerUrl(url?: string): URL { export function getServerUrl(url?: string): URL {