actions/setup-node
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testing 7z alt

Browse source
This commit is contained in:
Bryan MacFarlane 2020-05-03 18:22:18 -04:00
parent 11f920585c
commit beb2155295
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dist/index.js vendored
View file

@ -12975,6 +12975,7 @@ const io = __importStar(__webpack_require__(1));
const tc = __importStar(__webpack_require__(533));
const path = __importStar(__webpack_require__(622));
const semver = __importStar(__webpack_require__(280));
const fs = __webpack_require__(747);
function getNode(versionSpec, stable, token) {
return __awaiter(this, void 0, void 0, function* () {
let osPlat = os.platform();
@ -13017,7 +13018,10 @@ function getNode(versionSpec, stable, token) {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to folder matching file name
extPath = path.join(extPath, path.basename(info.fileName, '.7z'));
let nestedPath = path.join(extPath, path.basename(info.fileName, '.7z'));
if (fs.statSync(nestedPath) && fs.statSync(nestedPath).isDirectory()) {
extPath = nestedPath;
}
}
else {
extPath = yield tc.extractTar(downloadPath, undefined, [
@ -13048,7 +13052,8 @@ exports.getNode = getNode;
function getInfoFromManifest(versionSpec, stable, token) {
return __awaiter(this, void 0, void 0, function* () {
let info = null;
const releases = yield tc.getManifestFromRepo('actions', 'node-versions', token);
const releases = yield tc.getManifestFromRepo('actions', 'node-versions', token, 'update-versions-manifest-file' // TODO: remove after testing
);
console.log(`matching ${versionSpec}...`);
const rel = yield tc.findFromManifest(versionSpec, stable, releases);
if (rel && rel.files.length > 0) {

8
src/installer.ts
View file

@ -79,7 +79,10 @@ export async function getNode(
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to folder matching file name
extPath = path.join(extPath, path.basename(info.fileName, '.7z'));
let nestedPath = path.join(extPath, path.basename(info.fileName, '.7z'));
if (fs.statSync(nestedPath) && fs.statSync(nestedPath).isDirectory()) {
extPath = nestedPath;
}
} else {
extPath = await tc.extractTar(downloadPath, undefined, [
'xz',
@ -117,7 +120,8 @@ async function getInfoFromManifest(
const releases = await tc.getManifestFromRepo(
'actions',
'node-versions',
token
token,
'update-versions-manifest-file' // TODO: remove after testing
);
console.log(`matching ${versionSpec}...`);
const rel = await tc.findFromManifest(versionSpec, stable, releases);