Skip to content

Commit 2a62503

Browse files
authored
Add vm_service git package dependency override (#2078)
1 parent 1fa1960 commit 2a62503

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

dwds/pubspec_overrides.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependency_overrides:
2+
vm_service:
3+
git:
4+
url: https://github.com/dart-lang/sdk.git
5+
path: pkg/vm_service

tool/release.dart

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,12 @@ Future<int> runReset({
8484
return Future.value(1);
8585
}
8686

87-
// Add the dependency overrides of DWDS back for webdev:
87+
// Reset the dependency overrides for the package:
88+
_updateOverrides(package, includeOverrides: true);
89+
90+
// If updating webdev, also reset the dwds override for test_common to prevent
91+
// conflicts:
8892
if (package == 'webdev') {
89-
_updateOverrides('webdev', includeOverrides: true);
9093
_updateOverrides('test_common', includeOverrides: true);
9194
}
9295

@@ -124,14 +127,20 @@ Future<int> runRelease({
124127
}
125128
}
126129

130+
// Update the pinned version of DWDS for webdev releases.
127131
if (package == 'webdev') {
128-
// Update the pinned version of DWDS for webdev releases.
129132
_logInfo('Updating pinned version of DWDS.');
130133
await _updateDwdsPin('webdev');
131134
await _updateDwdsPin('test_common');
132-
// Remove the dependency overrides of DWDS for webdev releases:
133-
_logInfo('Removing dependency overrides of DWDS.');
134-
_updateOverrides('webdev', includeOverrides: false);
135+
}
136+
137+
// Remove any dependency overrides for the package:
138+
_logInfo('Removing dependency overrides for $package.');
139+
_updateOverrides(package, includeOverrides: false);
140+
141+
// If updating webdev, also remove the dwds override for test_common to
142+
// prevent conflicts:
143+
if (package == 'webdev') {
135144
_updateOverrides('test_common', includeOverrides: false);
136145
}
137146

0 commit comments

Comments
 (0)