miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(core): change getCache signature to only accept options (#28248)

Browse Source 
<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->
`getCache` has an argument for nxjson. This breaks nx cloud when using
the db cache.

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->
`getCache` now only has options as an argument, and uses `readNxJson` in
the function body

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
This commit is contained in:
Jonathan Cammisuli 2024-10-02 13:23:47 -04:00 committed by GitHub
parent 5a411540e7
commit 161a3f1b0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/nx/src/tasks-runner/cache.ts
View File

@ -29,17 +29,14 @@ export type CachedResult = {
}; };
export type TaskWithCachedResult = { task: Task; cachedResult: CachedResult }; export type TaskWithCachedResult = { task: Task; cachedResult: CachedResult };
export function getCache( // Do not change the order of these arguments as this function is used by nx cloud
nxJson: NxJsonConfiguration, export function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache {
options: DefaultTasksRunnerOptions const nxJson = readNxJson();
): DbCache | Cache {
return process.env.NX_DISABLE_DB !== 'true' && return process.env.NX_DISABLE_DB !== 'true' &&
(nxJson.enableDbCache === true || process.env.NX_DB_CACHE === 'true') (nxJson.enableDbCache === true || process.env.NX_DB_CACHE === 'true')
? new DbCache({ ? new DbCache({
// Remove this in Nx 21 // Remove this in Nx 21
nxCloudRemoteCache: isNxCloudUsed(readNxJson()) nxCloudRemoteCache: isNxCloudUsed(nxJson) ? options.remoteCache : null,
? options.remoteCache
: null,
}) })
: new Cache(options); : new Cache(options);
} }

2
packages/nx/src/tasks-runner/task-orchestrator.ts
View File

@ -36,7 +36,7 @@ import type { TaskDetails } from '../native';
export class TaskOrchestrator { export class TaskOrchestrator {
private taskDetails: TaskDetails | null = getTaskDetails(); private taskDetails: TaskDetails | null = getTaskDetails();
private cache: DbCache | Cache = getCache(this.nxJson, this.options); private cache: DbCache | Cache = getCache(this.options);
private forkedProcessTaskRunner = new ForkedProcessTaskRunner(this.options); private forkedProcessTaskRunner = new ForkedProcessTaskRunner(this.options);
private tasksSchedule = new TasksSchedule( private tasksSchedule = new TasksSchedule(