[Beta] Merge remote-tracking branch 'upstream/master' into beta (#1963)

* Update Rush version to address CVE Issues * Extend CI execution time * Add --no-sandbox to test runs (#1962) - Update rush * Fix merge issues
microsoft · Dec 15, 2022 · bdcef7e · bdcef7e
1 parent 9aba1bf
commit bdcef7e
Show file tree

Hide file tree

Showing 10 changed files with 445 additions and 222 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [12.x, 14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -30,6 +30,6 @@ jobs:
     - run: node common/scripts/install-run-rush.js check
     - run: node common/scripts/install-run-rush.js install
     - run: npm run build --verbose
-      timeout-minutes: 10
+      timeout-minutes: 20
     - run: npm run test --verbose
-      timeout-minutes: 15
+      timeout-minutes: 30
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/common/scripts/install-run-rush-silent.js b/common/scripts/install-run-rush-silent.js
diff --git a/common/scripts/install-run-silent.js b/common/scripts/install-run-silent.js