Skip to content

Commit

Permalink
chore(repo): run lint,test, and build in the same command in CI (#19189)
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz authored Sep 18, 2023
1 parent 56481d6 commit b2a9d4d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
6 changes: 1 addition & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,7 @@ jobs:
pnpm nx run-many -t check-imports check-commit check-lock-files check-codeowners documentation --parallel=1 --no-dte &
pids+=($!)
pnpm nx affected --target=lint --base=$NX_BASE --head=$NX_HEAD --parallel=3 &
pids+=($!)
pnpm nx affected --target=test --base=$NX_BASE --head=$NX_HEAD --parallel=1 &
pids+=($!)
(pnpm nx affected --target=build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &&
(pnpm nx affected --targets=lint,test,build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &&
pnpm nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
pids+=($!)
Expand Down
3 changes: 1 addition & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
}
},
"workspaceLayout": {
"appsDir": "",
"libsDir": ""
"projectNameAndRootFormat": "as-provided"
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
getRelativeImports,
getWithNxContent,
} from './create-next-config-file';
import { stripIndents } from '@nx/devkit';
import { stripIndents, workspaceLayout } from '@nx/devkit';
import { join } from 'path';

describe('Next.js config: getWithNxContent', () => {
Expand Down Expand Up @@ -60,8 +60,8 @@ describe('Next.js config: getWithNxContent', () => {
expect(result).not.toContain(
`const { workspaceRoot, workspaceLayout } = require('@nx/devkit');`
);
expect(result).toContain(`libsDir: ''`);
expect(result).not.toContain(`libsDir: workspaceLayout.libsDir()`);
expect(result).toContain(`libsDir: '${workspaceLayout().libsDir}'`);
expect(result).not.toContain(`libsDir: workspaceLayout().libsDir`);
});

it('should return relative module paths used in next.config.js when calling getRelativeFilesToCopy', () => {
Expand Down

1 comment on commit b2a9d4d

@vercel
Copy link

@vercel vercel bot commented on b2a9d4d Sep 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-five.vercel.app
nx.dev
nx-dev-nrwl.vercel.app
nx-dev-git-master-nrwl.vercel.app

Please sign in to comment.