diff options
| author | Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com> | 2023-04-13 14:25:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 14:25:50 +0200 |
| commit | 473c63f4d32bc90f0653642c05f1599d6f1fc97a (patch) | |
| tree | 9428cfe5f2d0fc3c989e4ceab103bb8868c41b3f /dist | |
| parent | f5ef935a2651bd991c6e6a2299e89435f5b21121 (diff) | |
Fix: convert baseUrl to serverApiUrl 'formatted' (#1289)
* fix: convert baseUrl to apiUrl
* Run prettier
---------
Co-authored-by: 1newsr <1newsr@users.noreply.github.com>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/index.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dist/index.js b/dist/index.js index 00db935..1b418d7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1453,6 +1453,7 @@ const path = __importStar(__nccwpck_require__(1017)); const retryHelper = __importStar(__nccwpck_require__(2155)); const toolCache = __importStar(__nccwpck_require__(7784)); const v4_1 = __importDefault(__nccwpck_require__(824)); +const url_helper_1 = __nccwpck_require__(9437); const IS_WINDOWS = process.platform === 'win32'; function downloadRepository(authToken, owner, repo, ref, commit, repositoryPath, baseUrl) { return __awaiter(this, void 0, void 0, function* () { @@ -1513,7 +1514,9 @@ function getDefaultBranch(authToken, owner, repo, baseUrl) { return yield retryHelper.execute(() => __awaiter(this, void 0, void 0, function* () { var _a; core.info('Retrieving the default branch name'); - const octokit = github.getOctokit(authToken, { baseUrl: baseUrl }); + const octokit = github.getOctokit(authToken, { + baseUrl: (0, url_helper_1.getServerApiUrl)(baseUrl) + }); let result; try { // Get the default branch from the repo info @@ -1545,7 +1548,9 @@ function getDefaultBranch(authToken, owner, repo, baseUrl) { exports.getDefaultBranch = getDefaultBranch; function downloadArchive(authToken, owner, repo, ref, commit, baseUrl) { return __awaiter(this, void 0, void 0, function* () { - const octokit = github.getOctokit(authToken, { baseUrl: baseUrl }); + const octokit = github.getOctokit(authToken, { + baseUrl: (0, url_helper_1.getServerApiUrl)(baseUrl) + }); const download = IS_WINDOWS ? octokit.rest.repos.downloadZipballArchive : octokit.rest.repos.downloadTarballArchive; @@ -2026,7 +2031,7 @@ function checkCommitInfo(token, commitInfo, repositoryOwner, repositoryName, ref if (actualHeadSha !== expectedHeadSha) { core.debug(`Expected head sha ${expectedHeadSha}; actual head sha ${actualHeadSha}`); const octokit = github.getOctokit(token, { - baseUrl: baseUrl, + baseUrl: (0, url_helper_1.getServerApiUrl)(baseUrl), userAgent: `actions-checkout-tracepoint/1.0 (code=STALE_MERGE;owner=${repositoryOwner};repo=${repositoryName};pr=${fromPayload('number')};run_id=${process.env['GITHUB_RUN_ID']};expected_head_sha=${expectedHeadSha};actual_head_sha=${actualHeadSha})` }); yield octokit.rest.repos.get({ |