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

Detect cached folders from multiple directories #735

Merged
merged 21 commits into from
Jun 21, 2023
+3,445 −1,496
Merged

Detect cached folders from multiple directories #735

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
02aa329
Add project-dir
dsame Apr 10, 2023
2d87f2f
Fix find lock file
dsame Apr 11, 2023
0b61567
Remove package-dir input
dsame Apr 13, 2023
9e025d3
format & resolve conflicts
dsame Apr 13, 2023
9b43de6
Add unit tests
dsame Apr 19, 2023
02b94f2
build dist
dsame Apr 24, 2023
8135560
Apply change request fixes
dsame Apr 24, 2023
a3d2aaf
handle non-dir cache-dependency-path
dsame May 4, 2023
d836439
bump cache version
dsame May 4, 2023
2b97a8f
run checks
dsame May 8, 2023
914a8e9
Handle globs in cacheDependencyPath
dsame May 11, 2023
5de08ea
refactor, introduce `cacheDependencyPathToProjectsDirectories`
dsame May 19, 2023
7406bf5
Changes requests
dsame May 22, 2023
9ddc512
Apply fixes
dsame May 30, 2023
d2b7e08
review fixes
dsame Jun 2, 2023
885f6b5
add e2e
dsame Jun 5, 2023
b8b9502
Add unique
dsame Jun 6, 2023
6aacde7
review updates
dsame Jun 8, 2023
3ef5272
review updates second stage
dsame Jun 14, 2023
17a4854
Review fixes 3
dsame Jun 16, 2023
e9e4944
imporve e2e tests
dsame Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix find lock file
  • Loading branch information
@dsame
dsame committed May 27, 2023
commit 2d87f2fcc7e45aca8f85bc25cca9420164e747b5
7 changes: 4 additions & 3 deletions dist/cache-save/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59248,7 +59248,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getPackageManagerWorkingDir = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
const core = __importStar(__nccwpck_require__(2186));
const exec = __importStar(__nccwpck_require__(1514));
const cache = __importStar(__nccwpck_require__(7799));
Expand Down Expand Up @@ -59294,8 +59294,9 @@ const getPackageManagerWorkingDir = () => {
const cacheDependencyPath = core.getInput('cache-dependency-path');
return cacheDependencyPath ? path_1.default.dirname(cacheDependencyPath) : null;
};
exports.getPackageManagerWorkingDir = getPackageManagerWorkingDir;
const getPackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, getPackageManagerWorkingDir());
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, exports.getPackageManagerWorkingDir());
if (!stdOut) {
throw new Error(`Could not retrieve version of ${packageManager}`);
}
Expand Down Expand Up @@ -59324,7 +59325,7 @@ const getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void
});
exports.getPackageManagerInfo = getPackageManagerInfo;
const getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, getPackageManagerWorkingDir());
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, exports.getPackageManagerWorkingDir());
if (!stdOut) {
throw new Error(`Could not get cache folder path for ${packageManager}`);
}
Expand Down
9 changes: 5 additions & 4 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71167,7 +71167,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
exports.restoreCache = restoreCache;
const findLockFile = (packageManager) => {
const lockFiles = packageManager.lockFilePatterns;
const workspace = process.env.GITHUB_WORKSPACE;
const workspace = cache_utils_1.getPackageManagerWorkingDir() || process.env.GITHUB_WORKSPACE;
const rootContent = fs_1.default.readdirSync(workspace);
const lockFile = lockFiles.find(item => rootContent.includes(item));
if (!lockFile) {
Expand Down Expand Up @@ -71216,7 +71216,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getPackageManagerWorkingDir = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
const core = __importStar(__nccwpck_require__(2186));
const exec = __importStar(__nccwpck_require__(1514));
const cache = __importStar(__nccwpck_require__(7799));
Expand Down Expand Up @@ -71262,8 +71262,9 @@ const getPackageManagerWorkingDir = () => {
const cacheDependencyPath = core.getInput('cache-dependency-path');
return cacheDependencyPath ? path_1.default.dirname(cacheDependencyPath) : null;
};
exports.getPackageManagerWorkingDir = getPackageManagerWorkingDir;
const getPackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, getPackageManagerWorkingDir());
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, exports.getPackageManagerWorkingDir());
if (!stdOut) {
throw new Error(`Could not retrieve version of ${packageManager}`);
}
Expand Down Expand Up @@ -71292,7 +71293,7 @@ const getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void
});
exports.getPackageManagerInfo = getPackageManagerInfo;
const getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, getPackageManagerWorkingDir());
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, exports.getPackageManagerWorkingDir());
if (!stdOut) {
throw new Error(`Could not get cache folder path for ${packageManager}`);
}
Expand Down
4 changes: 3 additions & 1 deletion src/cache-restore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {State} from './constants';
import {
getCacheDirectoryPath,
getPackageManagerInfo,
getPackageManagerWorkingDir,
PackageManagerInfo
} from './cache-utils';

Expand Down Expand Up @@ -55,7 +56,8 @@ export const restoreCache = async (

const findLockFile = (packageManager: PackageManagerInfo) => {
const lockFiles = packageManager.lockFilePatterns;
const workspace = process.env.GITHUB_WORKSPACE!;
const workspace =
getPackageManagerWorkingDir() || process.env.GITHUB_WORKSPACE!;
const rootContent = fs.readdirSync(workspace);

const lockFile = lockFiles.find(item => rootContent.includes(item));
Expand Down
2 changes: 1 addition & 1 deletion src/cache-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const getCommandOutput = async (
return stdout.trim();
};

const getPackageManagerWorkingDir = (): string | null => {
export const getPackageManagerWorkingDir = (): string | null => {
const projectDir = core.getInput('project-dir');
if (projectDir) {
return projectDir;
Expand Down