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

chore(repo): use same cleanup function for lerna e2e (#14747)

Browse Source
This commit is contained in:
Miroslav Jonaš 2023-02-01 20:18:41 +01:00 committed by GitHub
parent c23b74ef89
commit 8614f3ac62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/lerna-smoke-tests/src/lerna-smoke-tests.test.ts
View File

@ -4,7 +4,7 @@
*/ */
import { import {
cleanupLernaWorkspace, cleanupProject,
newLernaWorkspace, newLernaWorkspace,
runLernaCLI, runLernaCLI,
tmpProjPath, tmpProjPath,
@ -32,7 +32,7 @@ expect.addSnapshotSerializer({
describe('Lerna Smoke Tests', () => { describe('Lerna Smoke Tests', () => {
beforeAll(() => newLernaWorkspace()); beforeAll(() => newLernaWorkspace());
afterAll(() => cleanupLernaWorkspace()); afterAll(() => cleanupProject({ skipReset: true }));
// `lerna repair` builds on top of `nx repair` and runs all of its generators // `lerna repair` builds on top of `nx repair` and runs all of its generators
describe('lerna repair', () => { describe('lerna repair', () => {

17
e2e/utils/index.ts
View File

@ -511,18 +511,15 @@ export async function killPorts(port?: number): Promise<boolean> {
} }
// Useful in order to cleanup space during CI to prevent `No space left on device` exceptions // Useful in order to cleanup space during CI to prevent `No space left on device` exceptions
export async function cleanupProject(opts?: RunCmdOpts) { export function cleanupProject({
skipReset,
...opts
}: RunCmdOpts & { skipReset?: boolean } = {}) {
if (isCI) { if (isCI) {
// Stopping the daemon is not required for tests to pass, but it cleans up background processes // Stopping the daemon is not required for tests to pass, but it cleans up background processes
runCLI('reset', opts); if (!skipReset) {
try { runCLI('reset', opts);
removeSync(tmpProjPath()); }
} catch (e) {}
}
}
export function cleanupLernaWorkspace() {
if (isCI) {
try { try {
removeSync(tmpProjPath()); removeSync(tmpProjPath());
} catch (e) {} } catch (e) {}