diff --git a/packages/ci/src/lib/cli/context.unit.test.ts b/packages/ci/src/lib/cli/context.unit.test.ts index 8961caa77..c8041648a 100644 --- a/packages/ci/src/lib/cli/context.unit.test.ts +++ b/packages/ci/src/lib/cli/context.unit.test.ts @@ -12,10 +12,12 @@ describe('createCommandContext', () => { directory: '/test', logger: console, monorepo: false, + parallel: false, nxProjectsFilter: '--with-target={task}', projects: null, silent: false, task: 'code-pushup', + skipComment: false, }, null, ), @@ -38,10 +40,12 @@ describe('createCommandContext', () => { directory: '/test', logger: console, monorepo: false, + parallel: false, nxProjectsFilter: '--with-target={task}', projects: null, silent: false, task: 'code-pushup', + skipComment: false, }, { name: 'ui', diff --git a/packages/ci/src/lib/monorepo/handlers/nx.ts b/packages/ci/src/lib/monorepo/handlers/nx.ts index c84ab2d84..f84df2c1e 100644 --- a/packages/ci/src/lib/monorepo/handlers/nx.ts +++ b/packages/ci/src/lib/monorepo/handlers/nx.ts @@ -43,7 +43,7 @@ export const nxHandler: MonorepoToolHandler = { const projects = parseProjects(stdout); return projects.toSorted().map(project => ({ name: project, - bin: `npx nx run ${project}:${options.task} --`, + bin: `npx nx run ${project}:${options.task} --skip-nx-cache --`, })); }, diff --git a/packages/ci/src/lib/monorepo/handlers/nx.unit.test.ts b/packages/ci/src/lib/monorepo/handlers/nx.unit.test.ts index 4ad65905c..c7e14c173 100644 --- a/packages/ci/src/lib/monorepo/handlers/nx.unit.test.ts +++ b/packages/ci/src/lib/monorepo/handlers/nx.unit.test.ts @@ -56,8 +56,14 @@ describe('nxHandler', () => { it('should list projects from `nx show projects`', async () => { await expect(nxHandler.listProjects(options)).resolves.toEqual([ - { name: 'backend', bin: 'npx nx run backend:code-pushup --' }, - { name: 'frontend', bin: 'npx nx run frontend:code-pushup --' }, + { + name: 'backend', + bin: 'npx nx run backend:code-pushup --skip-nx-cache --', + }, + { + name: 'frontend', + bin: 'npx nx run frontend:code-pushup --skip-nx-cache --', + }, ] satisfies ProjectConfig[]); }); @@ -119,8 +125,14 @@ describe('nxHandler', () => { describe('createRunManyCommand', () => { const projects: MonorepoHandlerProjectsContext = { all: [ - { name: 'backend', bin: 'npx nx run backend:code-pushup --' }, - { name: 'frontend', bin: 'npx nx run frontend:code-pushup --' }, + { + name: 'backend', + bin: 'npx nx run backend:code-pushup --skip-nx-cache --', + }, + { + name: 'frontend', + bin: 'npx nx run frontend:code-pushup --skip-nx-cache --', + }, ], }; diff --git a/packages/ci/src/lib/monorepo/handlers/turbo.ts b/packages/ci/src/lib/monorepo/handlers/turbo.ts index 49e2e32f5..3d384d439 100644 --- a/packages/ci/src/lib/monorepo/handlers/turbo.ts +++ b/packages/ci/src/lib/monorepo/handlers/turbo.ts @@ -32,7 +32,7 @@ export const turboHandler: MonorepoToolHandler = { .map(({ name, directory }) => ({ name, directory, - bin: `npx turbo run ${options.task} --`, + bin: `npx turbo run ${options.task} --no-cache --force --`, })); } } diff --git a/packages/ci/src/lib/monorepo/handlers/turbo.unit.test.ts b/packages/ci/src/lib/monorepo/handlers/turbo.unit.test.ts index 5c36993dc..3bd62b687 100644 --- a/packages/ci/src/lib/monorepo/handlers/turbo.unit.test.ts +++ b/packages/ci/src/lib/monorepo/handlers/turbo.unit.test.ts @@ -137,12 +137,12 @@ describe('turboHandler', () => { { name: '@example/cli', directory: path.join(MEMFS_VOLUME, 'packages', 'cli'), - bin: 'npx turbo run code-pushup --', + bin: 'npx turbo run code-pushup --no-cache --force --', }, { name: '@example/core', directory: path.join(MEMFS_VOLUME, 'packages', 'core'), - bin: 'npx turbo run code-pushup --', + bin: 'npx turbo run code-pushup --no-cache --force --', }, ] satisfies ProjectConfig[]); }, @@ -171,16 +171,19 @@ describe('turboHandler', () => { name: 'api', directory: path.join(MEMFS_VOLUME, 'api'), bin: 'npx turbo run code-pushup --', + binUncached: 'npx turbo run code-pushup --no-cache --force --', }, { name: 'cms', directory: path.join(MEMFS_VOLUME, 'cms'), bin: 'npx turbo run code-pushup --', + binUncached: 'npx turbo run code-pushup --no-cache --force --', }, { name: 'web', directory: path.join(MEMFS_VOLUME, 'web'), bin: 'npx turbo run code-pushup --', + binUncached: 'npx turbo run code-pushup --no-cache --force --', }, ], }; diff --git a/packages/ci/src/lib/monorepo/list-projects.unit.test.ts b/packages/ci/src/lib/monorepo/list-projects.unit.test.ts index 63f6a5b70..c235b2b7c 100644 --- a/packages/ci/src/lib/monorepo/list-projects.unit.test.ts +++ b/packages/ci/src/lib/monorepo/list-projects.unit.test.ts @@ -58,8 +58,14 @@ describe('listMonorepoProjects', () => { await expect(listMonorepoProjects(MONOREPO_SETTINGS)).resolves.toEqual({ tool: 'nx', projects: [ - { name: 'backend', bin: 'npx nx run backend:code-pushup --' }, - { name: 'frontend', bin: 'npx nx run frontend:code-pushup --' }, + { + name: 'backend', + bin: 'npx nx run backend:code-pushup --skip-nx-cache --', + }, + { + name: 'frontend', + bin: 'npx nx run frontend:code-pushup --skip-nx-cache --', + }, ], runManyCommand: expect.any(Function), } satisfies MonorepoProjects); @@ -120,22 +126,22 @@ describe('listMonorepoProjects', () => { { name: 'api', directory: path.join(MEMFS_VOLUME, 'backend', 'api'), - bin: 'npx turbo run code-pushup --', + bin: 'npx turbo run code-pushup --no-cache --force --', }, { name: 'auth', directory: path.join(MEMFS_VOLUME, 'backend', 'auth'), - bin: 'npx turbo run code-pushup --', + bin: 'npx turbo run code-pushup --no-cache --force --', }, { name: 'cms', directory: path.join(MEMFS_VOLUME, 'frontend', 'cms'), - bin: 'npx turbo run code-pushup --', + bin: 'npx turbo run code-pushup --no-cache --force --', }, { name: 'web', directory: path.join(MEMFS_VOLUME, 'frontend', 'web'), - bin: 'npx turbo run code-pushup --', + bin: 'npx turbo run code-pushup --no-cache --force --', }, ], runManyCommand: expect.any(Function), diff --git a/packages/ci/src/lib/run.integration.test.ts b/packages/ci/src/lib/run.integration.test.ts index e775fee9c..068c93e86 100644 --- a/packages/ci/src/lib/run.integration.test.ts +++ b/packages/ci/src/lib/run.integration.test.ts @@ -455,7 +455,7 @@ describe('runInCI', () => { name: 'Nx', tool: 'nx', run: expect.stringMatching( - /^npx nx run (cli|core|utils):code-pushup --$/, + /^npx nx run (cli|core|utils):code-pushup --skip-nx-cache --$/, ), runMany: 'npx nx run-many --targets=code-pushup --parallel=false --projects=cli,core,utils --', @@ -463,7 +463,7 @@ describe('runInCI', () => { { name: 'Turborepo', tool: 'turbo', - run: 'npx turbo run code-pushup --', + run: 'npx turbo run code-pushup --no-cache --force --', runMany: 'npx turbo run code-pushup --concurrency=1 --', }, {