From 1cbee496b5c79c54a3502c666c284ab5bb3eecf4 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 1 Jul 2019 12:34:27 -0700 Subject: [PATCH] Elide the exact node version rush complains about from the docker output --- src/testRunner/externalCompileRunner.ts | 2 +- tests/baselines/reference/docker/azure-sdk.log | 2 +- tests/baselines/reference/docker/office-ui-fabric.log | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts index 1a027f975da0f..4be0d1a67ab3b 100644 --- a/src/testRunner/externalCompileRunner.ts +++ b/src/testRunner/externalCompileRunner.ts @@ -201,7 +201,7 @@ function sanitizeTimestamps(result: string): string { function sanitizeVersionSpecifiers(result: string): string { return result .replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx") - .replace(/([@v])\d+\.\d+\.\d+/g, "$1X.X.X"); + .replace(/([@v\()])\d+\.\d+\.\d+/g, "$1X.X.X"); } /** diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index 0069c7e433e62..011937533de12 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -82,7 +82,7 @@ rush rebuild - Errors! ( ? seconds) Standard error: -Your version of Node.js (12.4.0) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. +Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. XX of XX: [@azure/service-bus] completed with warnings in ? seconds XX of XX: [@azure/core-amqp] failed to build! XX of XX: [@azure/event-hubs] blocked by [@azure/core-amqp]! diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index 3657e61b3be4f..f2b746a7e28d6 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -311,7 +311,7 @@ rush rebuild - Errors! ( ? seconds) Standard error: -Your version of Node.js (12.4.0) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. +Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. XX of XX: [@uifabric/codepen-loader] completed with warnings in ? seconds XX of XX: [@uifabric/set-version] completed with warnings in ? seconds XX of XX: [@uifabric/merge-styles] completed with warnings in ? seconds