diff --git a/.circleci/config.yml b/.circleci/config.yml index b492ceaf87..a723f27249 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,6 +124,9 @@ jobs: - run: name: Run Unit Tests command: npx nx affected --target=test --parallel --max-parallel=2 + - run: + name: Run Linting + command: npx nx affected --target=lint --parallel --max-parallel=4 - run: name: Run E2E Tests command: npx nx affected --target=e2e @@ -156,6 +159,9 @@ jobs: - run: name: Run Unit Tests command: npx nx affected --target=test --base=HEAD~1 --parallel --max-parallel=2 + - run: + name: Run Linting + command: npx nx affected --target=lint --base=HEAD~1 --parallel --max-parallel=4 - run: name: Run E2E Tests command: npx nx affected --target=e2e --base=HEAD~1 diff --git a/nx.json b/nx.json index 9fc8a6c7b8..fdd446354e 100644 --- a/nx.json +++ b/nx.json @@ -8,7 +8,7 @@ "default": { "runner": "@nrwl/nx-cloud", "options": { - "accessToken": "OTM4MGQ1NDctZGRjMy00ZDlmLThkYzQtOTU3MDhkNWZhZjcwfHJlYWQ=", + "accessToken": "YzVhYjFiNzAtYTYxZS00OWM3LTlkOGYtZjRmOGRlNDY4MTJhfHJlYWQtd3JpdGU=", "cacheableOperations": ["build", "build-base", "test", "lint", "e2e"], "canTrackAnalytics": false, "showUsageWarnings": true, diff --git a/package.json b/package.json index 763619f3a9..b8435093c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nrwl/nx-source", - "version": "12.2.0", + "version": "12.3.0-beta.2", "description": "Powerful, Extensible Dev Tools", "homepage": "https://nx.dev", "private": true, @@ -64,7 +64,7 @@ "@nrwl/linter": "12.3.0-beta.1", "@nrwl/next": "12.3.0-beta.1", "@nrwl/node": "12.3.0-beta.1", - "@nrwl/nx-cloud": "12.1.1-beta.5", + "@nrwl/nx-cloud": "12.1.1-beta.12", "@nrwl/tao": "12.3.0-beta.1", "@nrwl/web": "12.3.0-beta.1", "@nrwl/workspace": "12.3.0-beta.1", diff --git a/packages/linter/src/executors/eslint/hasher.ts b/packages/linter/src/executors/eslint/hasher.ts index c668305e99..13522e648f 100644 --- a/packages/linter/src/executors/eslint/hasher.ts +++ b/packages/linter/src/executors/eslint/hasher.ts @@ -8,31 +8,30 @@ export default async function run( taskGraph: TaskGraph, hasher: Hasher ): Promise { - return hasher.hashTaskWithDepsAndContext(task); - // if (task.overrides['hasTypeAwareRules'] === true) { - // return hasher.hashTaskWithDepsAndContext(task); - // } - // const sources = await hasher.hashSource(task); - // const deps = allDeps(task.id, taskGraph); - // const nxJson = readJsonFile('nx.json'); - // const tags = deps - // .map((d) => (nxJson.projects[d].tags || []).join('|')) - // .join('|'); - // const context = await hasher.hashContext(); - // return { - // value: hasher.hashArray([ - // sources, - // tags, - // context.implicitDeps.value, - // context.runtime.value, - // ]), - // details: { - // command: null, - // runtime: context.runtime.runtime, - // implicitDeps: context.implicitDeps.sources, - // sources: { [task.target.project]: sources }, - // }, - // }; + if (task.overrides['hasTypeAwareRules'] === true) { + return hasher.hashTaskWithDepsAndContext(task); + } + const sources = await hasher.hashSource(task); + const deps = allDeps(task.id, taskGraph); + const nxJson = readJsonFile('nx.json'); + const tags = deps + .map((d) => (nxJson.projects[d].tags || []).join('|')) + .join('|'); + const context = await hasher.hashContext(); + return { + value: hasher.hashArray([ + sources, + tags, + context.implicitDeps.value, + context.runtime.value, + ]), + details: { + command: null, + runtime: context.runtime.runtime, + implicitDeps: context.implicitDeps.sources, + sources: { [task.target.project]: sources }, + }, + }; } function allDeps(taskId: string, taskGraph: TaskGraph) { diff --git a/yarn.lock b/yarn.lock index a894eaa0b2..bae3e5b9a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2813,10 +2813,10 @@ webpack-merge "4.2.1" webpack-node-externals "1.7.2" -"@nrwl/nx-cloud@12.1.1-beta.5": - version "12.1.1-beta.5" - resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-12.1.1-beta.5.tgz#4eb1402711be37f273f71831cf6960098855ed2b" - integrity sha512-2eIGXyIClWM5cq7rzAszEsXuRchFP5Olt2A1x+O+yAdgb8M7DtpmtVnPmTCGRuD8RjBVRhDxFdX6+dOXuw5Sog== +"@nrwl/nx-cloud@12.1.1-beta.12": + version "12.1.1-beta.12" + resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-12.1.1-beta.12.tgz#91c4b45ab71bc73d99014f54b3c84f3485c35328" + integrity sha512-ZMYidr1m9qxh5+tRCl3eDJCpoaMRc4ovHHKkOxN/6T4JxWE1JQPyKnRe4YYMvwX/OixV/SrppE5UM7nNdd9pcw== dependencies: axios "^0.21.1" chalk "4.1.0"