Skip to content

Commit 48e3211

Browse files
authored
Update the release script to take into account pubspec_overrides.yaml (#2080)
1 parent fd75f51 commit 48e3211

File tree

1 file changed

+32
-6
lines changed

1 file changed

+32
-6
lines changed

Diff for: tool/release.dart

+32-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void main(List<String> arguments) async {
5252

5353
int exitCode;
5454
if (isReset == true) {
55-
exitCode = runReset(
55+
exitCode = await runReset(
5656
package: package,
5757
newVersion: newVersion,
5858
);
@@ -68,7 +68,7 @@ void main(List<String> arguments) async {
6868
}
6969
}
7070

71-
int runReset({
71+
Future<int> runReset({
7272
required String package,
7373
String? newVersion,
7474
}) {
@@ -81,7 +81,13 @@ int runReset({
8181
Current version is $currentVersion.
8282
''',
8383
);
84-
return 1;
84+
return Future.value(1);
85+
}
86+
87+
// Add the dependency overrides of DWDS back for webdev:
88+
if (package == 'webdev') {
89+
_updateOverrides('webdev', includeOverrides: true);
90+
_updateOverrides('test_common', includeOverrides: true);
8591
}
8692

8793
// Update the version strings in CHANGELOG and pubspec.yaml.
@@ -92,7 +98,9 @@ int runReset({
9298
isReset: true,
9399
);
94100

95-
return 0;
101+
// Build the package.
102+
final exitCode = _buildPackage(package);
103+
return exitCode;
96104
}
97105

98106
Future<int> runRelease({
@@ -116,10 +124,15 @@ Future<int> runRelease({
116124
}
117125
}
118126

119-
// Update the pinned version of DWDS for webdev releases.
120127
if (package == 'webdev') {
128+
// Update the pinned version of DWDS for webdev releases.
121129
_logInfo('Updating pinned version of DWDS.');
122-
await _updateDwdsPin(package);
130+
await _updateDwdsPin('webdev');
131+
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+
_updateOverrides('test_common', includeOverrides: false);
123136
}
124137

125138
// Run dart pub upgrade.
@@ -175,6 +188,19 @@ Future<int> _buildPackage(String package) async {
175188
return buildProcess.exitCode;
176189
}
177190

191+
void _updateOverrides(
192+
String package, {
193+
required bool includeOverrides,
194+
}) {
195+
final overridesFilePath = '../$package/pubspec_overrides.yaml';
196+
final noOverridesFilePath = '../$package/ignore_pubspec_overrides.yaml';
197+
if (includeOverrides) {
198+
File(noOverridesFilePath).rename(overridesFilePath);
199+
} else {
200+
File(overridesFilePath).rename(noOverridesFilePath);
201+
}
202+
}
203+
178204
void _updateVersionStrings(
179205
String package, {
180206
required String nextVersion,

0 commit comments

Comments
 (0)