From 8ade6aebfa21d282255bd43a94f01f91415e8e72 Mon Sep 17 00:00:00 2001 From: eric sciple Date: Mon, 9 Dec 2019 20:04:52 -0500 Subject: [PATCH] . --- dist/index.js | 21 +++++++++++++++++++-- src/github-api-helper.ts | 26 ++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index b8eb933..13acce0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8089,9 +8089,11 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const assert = __importStar(__webpack_require__(357)); +const core = __importStar(__webpack_require__(470)); const exec = __importStar(__webpack_require__(986)); const fs = __importStar(__webpack_require__(747)); const github = __importStar(__webpack_require__(469)); +const io = __importStar(__webpack_require__(1)); const path = __importStar(__webpack_require__(622)); const IS_WINDOWS = process.platform === 'win32'; function downloadRepository(accessToken, owner, repo, ref, repositoryPath) { @@ -8117,14 +8119,29 @@ function downloadRepository(accessToken, owner, repo, ref, repositoryPath) { // } const runnerTemp = process.env['RUNNER_TEMP']; assert.ok(runnerTemp, 'RUNNER_TEMP not defined'); - const archiveFile = path.join(runnerTemp, 'checkout.tar.gz'); + const archiveFile = path.join(runnerTemp, 'checkout-archive.tar.gz'); + yield io.rmRF(archiveFile); yield fs.promises.writeFile(archiveFile, new Buffer(response.data)); yield exec.exec(`ls -la "${archiveFile}"`, [], { cwd: repositoryPath }); + const extractPath = path.join(runnerTemp, 'checkout-archive'); + yield io.rmRF(extractPath); + yield io.mkdirP(extractPath); yield exec.exec(`tar -xzf "${archiveFile}"`, [], { - cwd: repositoryPath + cwd: extractPath }); + // Determine the real directory to copy (ignore extra dir at root of the archive) + const archiveFileNames = yield fs.promises.readdir(extractPath); + assert.ok(archiveFileNames.length == 1, 'Expected exactly one directory inside archive'); + const extraDirectoryName = archiveFileNames[0]; + core.info(`Resolved ${extraDirectoryName}`); // contains the short SHA + const tempRepositoryPath = path.join(extractPath, extraDirectoryName); + for (const fileName of tempRepositoryPath) { + const sourcePath = path.join(tempRepositoryPath, fileName); + const targetPath = path.join(repositoryPath, fileName); + yield io.mv(sourcePath, targetPath); + } yield exec.exec(`find .`, [], { cwd: repositoryPath }); diff --git a/src/github-api-helper.ts b/src/github-api-helper.ts index 01e3bdd..7c08b00 100644 --- a/src/github-api-helper.ts +++ b/src/github-api-helper.ts @@ -41,14 +41,36 @@ export async function downloadRepository( // } const runnerTemp = process.env['RUNNER_TEMP'] as string assert.ok(runnerTemp, 'RUNNER_TEMP not defined') - const archiveFile = path.join(runnerTemp, 'checkout.tar.gz') + const archiveFile = path.join(runnerTemp, 'checkout-archive.tar.gz') + await io.rmRF(archiveFile) await fs.promises.writeFile(archiveFile, new Buffer(response.data)) await exec.exec(`ls -la "${archiveFile}"`, [], { cwd: repositoryPath } as ExecOptions) + + const extractPath = path.join(runnerTemp, 'checkout-archive') + await io.rmRF(extractPath) + await io.mkdirP(extractPath) await exec.exec(`tar -xzf "${archiveFile}"`, [], { - cwd: repositoryPath + cwd: extractPath } as ExecOptions) + + // Determine the real directory to copy (ignore extra dir at root of the archive) + const archiveFileNames = await fs.promises.readdir(extractPath) + assert.ok( + archiveFileNames.length == 1, + 'Expected exactly one directory inside archive' + ) + const extraDirectoryName = archiveFileNames[0] + core.info(`Resolved ${extraDirectoryName}`) // contains the short SHA + const tempRepositoryPath = path.join(extractPath, extraDirectoryName) + + for (const fileName of tempRepositoryPath) { + const sourcePath = path.join(tempRepositoryPath, fileName) + const targetPath = path.join(repositoryPath, fileName) + await io.mv(sourcePath, targetPath) + } + await exec.exec(`find .`, [], { cwd: repositoryPath } as ExecOptions)