Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix path handling inconsistency in installer caching #230

Merged
merged 4 commits into from Nov 11, 2022
Merged

Fix path handling inconsistency in installer caching #230

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dc6abd
Fix installer cache path inconsistency
AndreasAlbertQC May 19, 2022
b31939b
Update src/installer/base.ts
AndreasAlbertQC May 23, 2022
b81279e
Clean up path.join syntax
AndreasAlbertQC May 23, 2022
632ccd2
Add comment to explain path manipulation
AndreasAlbertQC Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions dist/setup/index.js
View file
Open in desktop
Expand Up @@ -6948,9 +6948,11 @@ function ensureLocalInstaller(options) {
}
if (executablePath === "") {
core.info(`Checking for cached ${tool}@${version}...`);
executablePath = tc.find(installerName, version, ...(options.arch ? [options.arch] : []));
if (executablePath !== "") {
core.info(`Found ${installerName} cache at ${executablePath}!`);
let cacheDirectoryPath = tc.find(installerName, version, ...(options.arch ? [options.arch] : []));
if (cacheDirectoryPath !== "") {
core.info(`Found ${installerName} cache at ${cacheDirectoryPath}!`);
executablePath = path.join(cacheDirectoryPath, installerName);
core.info(`executablePath is ${executablePath}`);
}
else {
core.info(`Did not find ${installerName} ${version} in cache`);
Expand Down Expand Up @@ -32031,7 +32033,7 @@ module.exports.safeLoad = safeLoad;
/* 771 */
/***/ (function(module) {

module.exports = {"_args":[["cheerio@1.0.0-rc.3","/Users/jrodriguez/devel/setup-miniconda"]],"_from":"cheerio@1.0.0-rc.3","_id":"cheerio@1.0.0-rc.3","_inBundle":false,"_integrity":"sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==","_location":"/cheerio","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"cheerio@1.0.0-rc.3","name":"cheerio","escapedName":"cheerio","rawSpec":"1.0.0-rc.3","saveSpec":null,"fetchSpec":"1.0.0-rc.3"},"_requiredBy":["/get-hrefs"],"_resolved":"https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz","_spec":"1.0.0-rc.3","_where":"/Users/jrodriguez/devel/setup-miniconda","author":{"name":"Matt Mueller","email":"mattmuelle@gmail.com","url":"mat.io"},"bugs":{"url":"https://github.com/cheeriojs/cheerio/issues"},"dependencies":{"css-select":"~1.2.0","dom-serializer":"~0.1.1","entities":"~1.1.1","htmlparser2":"^3.9.1","lodash":"^4.15.0","parse5":"^3.0.1"},"description":"Tiny, fast, and elegant implementation of core jQuery designed specifically for the server","devDependencies":{"benchmark":"^2.1.0","coveralls":"^2.11.9","expect.js":"~0.3.1","istanbul":"^0.4.3","jquery":"^3.0.0","jsdom":"^9.2.1","jshint":"^2.9.2","mocha":"^3.1.2","xyz":"~1.1.0"},"engines":{"node":">= 0.6"},"files":["index.js","lib"],"homepage":"https://github.com/cheeriojs/cheerio#readme","keywords":["htmlparser","jquery","selector","scraper","parser","html"],"license":"MIT","main":"./index.js","name":"cheerio","repository":{"type":"git","url":"git://github.com/cheeriojs/cheerio.git"},"scripts":{"test":"make test"},"version":"1.0.0-rc.3"};
module.exports = {"_args":[["cheerio@1.0.0-rc.3","/work"]],"_from":"cheerio@1.0.0-rc.3","_id":"cheerio@1.0.0-rc.3","_inBundle":false,"_integrity":"sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==","_location":"/cheerio","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"cheerio@1.0.0-rc.3","name":"cheerio","escapedName":"cheerio","rawSpec":"1.0.0-rc.3","saveSpec":null,"fetchSpec":"1.0.0-rc.3"},"_requiredBy":["/get-hrefs"],"_resolved":"https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz","_spec":"1.0.0-rc.3","_where":"/work","author":{"name":"Matt Mueller","email":"mattmuelle@gmail.com","url":"mat.io"},"bugs":{"url":"https://github.com/cheeriojs/cheerio/issues"},"dependencies":{"css-select":"~1.2.0","dom-serializer":"~0.1.1","entities":"~1.1.1","htmlparser2":"^3.9.1","lodash":"^4.15.0","parse5":"^3.0.1"},"description":"Tiny, fast, and elegant implementation of core jQuery designed specifically for the server","devDependencies":{"benchmark":"^2.1.0","coveralls":"^2.11.9","expect.js":"~0.3.1","istanbul":"^0.4.3","jquery":"^3.0.0","jsdom":"^9.2.1","jshint":"^2.9.2","mocha":"^3.1.2","xyz":"~1.1.0"},"engines":{"node":">= 0.6"},"files":["index.js","lib"],"homepage":"https://github.com/cheeriojs/cheerio#readme","keywords":["htmlparser","jquery","selector","scraper","parser","html"],"license":"MIT","main":"./index.js","name":"cheerio","repository":{"type":"git","url":"git://github.com/cheeriojs/cheerio.git"},"scripts":{"test":"make test"},"version":"1.0.0-rc.3"};

/***/ }),
/* 772 */
Expand Down
8 changes: 5 additions & 3 deletions src/installer/base.ts
View file
Open in desktop
Expand Up @@ -46,13 +46,15 @@ export async function ensureLocalInstaller(

if (executablePath === "") {
core.info(`Checking for cached ${tool}@${version}...`);
executablePath = tc.find(
let cacheDirectoryPath = tc.find(
AndreasAlbertQC marked this conversation as resolved.
Show resolved Hide resolved
installerName,
version,
...(options.arch ? [options.arch] : [])
);
if (executablePath !== "") {
core.info(`Found ${installerName} cache at ${executablePath}!`);
if (cacheDirectoryPath !== "") {
core.info(`Found ${installerName} cache at ${cacheDirectoryPath}!`);
executablePath = path.join(cacheDirectoryPath, installerName);
core.info(`executablePath is ${executablePath}`);
} else {
core.info(`Did not find ${installerName} ${version} in cache`);
}
Expand Down