mirror of
https://github.com/actions/checkout.git
synced 2025-03-28 11:00:05 +01:00
alter getBaseUrl
This commit is contained in:
parent
5f56636ef8
commit
5e05fe08e6
1 changed files with 5 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
import * as assert from 'assert'
|
||||
import {URL} from 'url'
|
||||
import {IGitSourceSettings} from './git-source-settings'
|
||||
import { URL } from 'url'
|
||||
import { IGitSourceSettings } from './git-source-settings'
|
||||
|
||||
export function getFetchUrl(settings: IGitSourceSettings): string {
|
||||
assert.ok(
|
||||
|
@ -16,7 +16,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string {
|
|||
}
|
||||
|
||||
// "origin" is SCHEME://HOSTNAME[:PORT]
|
||||
const baseURL = getBaseUrl(serviceUrl.href)
|
||||
const baseURL = getBaseUrl(serviceUrl)
|
||||
return `${baseURL}/${encodedOwner}/${encodedName}`
|
||||
}
|
||||
|
||||
|
@ -28,9 +28,8 @@ export function getServerUrl(url?: string): URL {
|
|||
return new URL(urlValue)
|
||||
}
|
||||
|
||||
export function getBaseUrl(url: string): string {
|
||||
const matcher = url.match(/^[^?]+/)
|
||||
return (matcher && matcher[0].replace(/\/+$/g, '')) || ''
|
||||
function getBaseUrl(u: URL) {
|
||||
return u.protocol + "//" + u.host + u.pathname.replace(/\/+$/g, '');
|
||||
}
|
||||
|
||||
export function getServerApiUrl(url?: string): string {
|
||||
|
|
Loading…
Add table
Reference in a new issue