From 42409b74aded9bc56993e99e44e58af5f36d7ddd Mon Sep 17 00:00:00 2001 From: Michael Tedder Date: Tue, 18 Apr 2023 20:06:20 +0900 Subject: [PATCH] upgrade to v3.5.2: merge branch 'main' from actions/checkout into coldfusionjp/main * main: Release v3.5.2 (#1291) Fix: convert baseUrl to serverApiUrl 'formatted' (#1289) --- CHANGELOG.md | 3 +++ dist/index.js | 11 ++++++++--- package-lock.json | 4 ++-- package.json | 2 +- src/github-api-helper.ts | 9 +++++++-- src/ref-helper.ts | 4 ++-- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f907a9e4c..10f6d4146 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## v3.5.2 +- [Fix api endpoint for GHES](https://github.com/actions/checkout/pull/1289) + ## v3.5.1 - [Fix slow checkout on Windows](https://github.com/actions/checkout/pull/1246) diff --git a/dist/index.js b/dist/index.js index 6b4948d98..445967811 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1503,6 +1503,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* () { @@ -1563,7 +1564,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 @@ -1595,7 +1598,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; @@ -2081,7 +2086,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({ diff --git a/package-lock.json b/package-lock.json index 6ec78a9dd..5253833d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "checkout-plus", - "version": "3.5.1", + "version": "3.5.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "checkout-plus", - "version": "3.5.1", + "version": "3.5.2", "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", diff --git a/package.json b/package.json index 07e5ab8d8..cad8095de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "checkout-plus", - "version": "3.5.1", + "version": "3.5.2", "description": "Checkout Plus action", "main": "lib/main.js", "scripts": { diff --git a/src/github-api-helper.ts b/src/github-api-helper.ts index 86632f5b9..b6bfc137a 100644 --- a/src/github-api-helper.ts +++ b/src/github-api-helper.ts @@ -7,6 +7,7 @@ import * as path from 'path' import * as retryHelper from './retry-helper' import * as toolCache from '@actions/tool-cache' import {default as uuid} from 'uuid/v4' +import {getServerApiUrl} from './url-helper' const IS_WINDOWS = process.platform === 'win32' @@ -84,7 +85,9 @@ export async function getDefaultBranch( ): Promise { return await retryHelper.execute(async () => { core.info('Retrieving the default branch name') - const octokit = github.getOctokit(authToken, {baseUrl: baseUrl}) + const octokit = github.getOctokit(authToken, { + baseUrl: getServerApiUrl(baseUrl) + }) let result: string try { // Get the default branch from the repo info @@ -125,7 +128,9 @@ async function downloadArchive( commit: string, baseUrl?: string ): Promise { - const octokit = github.getOctokit(authToken, {baseUrl: baseUrl}) + const octokit = github.getOctokit(authToken, { + baseUrl: getServerApiUrl(baseUrl) + }) const download = IS_WINDOWS ? octokit.rest.repos.downloadZipballArchive : octokit.rest.repos.downloadTarballArchive diff --git a/src/ref-helper.ts b/src/ref-helper.ts index 9b1ca95b9..1c2504986 100644 --- a/src/ref-helper.ts +++ b/src/ref-helper.ts @@ -1,7 +1,7 @@ import {IGitCommandManager} from './git-command-manager' import * as core from '@actions/core' import * as github from '@actions/github' -import {isGhes} from './url-helper' +import {getServerApiUrl, isGhes} from './url-helper' export const tagsRefSpec = '+refs/tags/*:refs/tags/*' @@ -245,7 +245,7 @@ export async function checkCommitInfo( `Expected head sha ${expectedHeadSha}; actual head sha ${actualHeadSha}` ) const octokit = github.getOctokit(token, { - baseUrl: baseUrl, + baseUrl: getServerApiUrl(baseUrl), userAgent: `actions-checkout-tracepoint/1.0 (code=STALE_MERGE;owner=${repositoryOwner};repo=${repositoryName};pr=${fromPayload( 'number' )};run_id=${