Skip to content

Commit 13dce1a

Browse files
Merge branch 'main' into issue-4404-utility-target-shadowing
2 parents 770b463 + 8d33ffb commit 13dce1a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

test/end-to-end-tests/single-root-UI/test/coverage.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { DefaultEnvironment, expect } from '@test/util';
1+
// Disable as it's blocking tests in PR's, we should investigate this further in order to re-enable.
2+
/**import { DefaultEnvironment, expect } from '@test/util';
23
import * as vscode from 'vscode';
34
import * as fs from 'fs';
45
import * as path from 'path';
@@ -75,3 +76,4 @@ suite('Coverage integration', () => {
7576
expect(fs.existsSync(path.join(testEnv.projectFolder.location, testEnv.buildLocation, 'lcov.info'))).to.be.true;
7677
}).timeout(60000);
7778
});
79+
*/

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6870,9 +6870,9 @@ tapable@^2.1.1, tapable@^2.2.0:
68706870
integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
68716871

68726872
tar-fs@^2.0.0:
6873-
version "2.1.2"
6874-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
6875-
integrity sha1-Ql8VTzQEyxbLj/bmcdRasu2VlsU=
6873+
version "2.1.3"
6874+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
6875+
integrity sha1-+zuIQ6JrbxOgjmBveSKHXrH7v5I=
68766876
dependencies:
68776877
chownr "^1.1.1"
68786878
mkdirp-classic "^0.5.2"

0 commit comments

Comments
 (0)