diff --git a/dist/index.js b/dist/index.js index ebb1c06..ede61a0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -36005,7 +36005,7 @@ function getFetchUrl(settings) { const encodedOwner = encodeURIComponent(settings.repositoryOwner); const encodedName = encodeURIComponent(settings.repositoryName); if (settings.sshKey) { - return `git@${serviceUrl.hostname}/gitea:${encodedOwner}/${encodedName}.git`; + return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git`; } // "origin" is SCHEME://HOSTNAME[:PORT] return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`; @@ -36013,9 +36013,9 @@ function getFetchUrl(settings) { exports.getFetchUrl = getFetchUrl; function getServerUrl() { // todo: remove GITHUB_URL after support for GHES Alpha is no longer needed - return new url_1.URL(process.env['GITHUB_SERVER_URL'] || - process.env['GITHUB_URL'] || - 'https://github.com'); + return new url_1.URL(process.env['GITHUB_SERVER_URL'] + '/gitea' || + 0 || + 0); } exports.getServerUrl = getServerUrl; diff --git a/src/url-helper.ts b/src/url-helper.ts index 1518e12..d9a16d9 100644 --- a/src/url-helper.ts +++ b/src/url-helper.ts @@ -12,7 +12,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string { const encodedOwner = encodeURIComponent(settings.repositoryOwner) const encodedName = encodeURIComponent(settings.repositoryName) if (settings.sshKey) { - return `git@${serviceUrl.hostname}/gitea:${encodedOwner}/${encodedName}.git` + return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git` } // "origin" is SCHEME://HOSTNAME[:PORT] @@ -22,7 +22,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string { 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'] || + process.env['GITHUB_SERVER_URL'] + '/gitea' || process.env['GITHUB_URL'] || 'https://github.com' )