Skip to content

Commit

Permalink
chore(repo): update the version of nx cloud
Browse files Browse the repository at this point in the history
  • Loading branch information
vsavkin committed Nov 19, 2021
1 parent 5293b2d commit 1ddb612
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 291 deletions.
352 changes: 74 additions & 278 deletions .circleci/config.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion e2e/angular-extensions/src/storybook.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('Angular Package', () => {
});

describe('build storybook', () => {
it('should execute e2e tests using Cypress running against Storybook', async () => {
xit('should execute e2e tests using Cypress running against Storybook', async () => {
if (isNotWindows()) {
const myapp = uniq('myapp');
runCLI(`generate @nrwl/angular:app ${myapp} --no-interactive`);
Expand Down
6 changes: 5 additions & 1 deletion e2e/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,11 @@ export function packageInstall(
) {
const cwd = projName ? `${e2eCwd}/${projName}` : tmpProjPath();
const pm = getPackageManagerCommand({ path: cwd });
const install = execSync(`${pm.addDev} ${pkg}@${version}`, {
const pkgsWithVersions = pkg
.split(' ')
.map((pgk) => `${pgk}@${version}`)
.join(' ');
const install = execSync(`${pm.addDev} ${pkgsWithVersions}`, {
cwd,
stdio: [0, 1, 2],
env: process.env,
Expand Down
5 changes: 1 addition & 4 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
"sitemap"
],
"useDaemonProcess": true,
"runtimeCacheInputs": [
"echo $SELECTED_CLI",
"echo $NX_E2E_CI_CACHE_KEY"
],
"runtimeCacheInputs": ["echo $SELECTED_CLI", "echo $E2E_CI_CACHE_KEY"],
"cacheDirectory": "/tmp/nx-cache"
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@nrwl/linter": "13.2.0-rc.4",
"@nrwl/next": "13.2.0-rc.4",
"@nrwl/node": "13.2.0-rc.4",
"@nrwl/nx-cloud": "12.5.4",
"@nrwl/nx-cloud": "13.0.0-beta.11",
"@nrwl/react": "13.2.0-rc.4",
"@nrwl/tao": "13.2.0-rc.4",
"@nrwl/web": "13.2.0-rc.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const defaultTasksRunner: TasksRunner<DefaultTasksRunnerOptions> =
(options as any)['maxParallel'] || 3
);
} else if (options.parallel === undefined) {
options.parallel = 3;
options.parallel = Number((options as any)['maxParallel'] || 3);
}

options.lifeCycle.startCommand();
Expand Down
5 changes: 4 additions & 1 deletion scripts/e2e-build-package-publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@ async function publishPackage(packagePath: string, npmMajorVersion: number) {

function build(nxVersion: string) {
try {
const b = new Date();
execSync('npx nx run-many --target=build --all --parallel=8', {
stdio: ['pipe', 'pipe', 'pipe'],
env: { ...process.env, NX_INVOKED_BY_RUNNER: 'false' },
});
console.log('Packages built successfully');
const a = new Date();
console.log(`Packages built successfully in ${a.getTime() - b.getTime()}`);
} catch (e) {
console.log(e.output.toString());
console.log('Build failed. See error above.');
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2813,10 +2813,10 @@
webpack-merge "^5.8.0"
webpack-node-externals "^3.0.0"

"@nrwl/nx-cloud@12.5.4":
version "12.5.4"
resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-12.5.4.tgz#496ed99208664318607d0ae6b3ad273bf64b38c9"
integrity sha512-FHNTF0S1dMPddDstY6MUjZ30f99wVnZ46Q8r5plASxBPUvPAqPI8TRYzYTcPSAcf7s5NB3lAnLXw0wvN+8+4Ig==
"@nrwl/nx-cloud@13.0.0-beta.11":
version "13.0.0-beta.11"
resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-13.0.0-beta.11.tgz#ddf58f580f7e8e29c47d014e18f343dbf763ff35"
integrity sha512-O+fld55zexC03LU3y03LVeXrd9oB8r0oPjGM3yT6Tr0bQ9UlH8ydxwL6wCVGH4dfWpaDIsK3y7u5olxc0He2wQ==
dependencies:
axios "^0.21.1"
chalk "4.1.0"
Expand Down

0 comments on commit 1ddb612

Please sign in to comment.