Skip to content

Commit 08ee5e9

Browse files
authored
Tweak grinder and pubspec from other branch for a more minimalistic approach (#2503)
1 parent 2e3f4bf commit 08ee5e9

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
matrix:
2121
os: [ubuntu-latest]
2222
sdk: [dev, stable]
23-
# Add sdk-analyzer once #2500 is addressed
24-
job: [main, flutter, packages, sdk-docs]
23+
job: [main, flutter, sdk-analyzer, packages, sdk-docs]
2524
include:
2625
- os: macos-latest
2726
sdk: dev

pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ dev_dependencies:
3232
build_version: ^2.0.1
3333
coverage: ^0.14.0
3434
dart_style: ^1.3.9
35-
dhttpd: ^3.0.0
3635
grinder: ^0.8.2
3736
http: ^0.12.0
3837
pedantic: ^1.9.0

tool/grind.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,13 @@ Future<String> createSdkDartdoc(bool overrideMeta) async {
470470
dartdocPubspec.writeAsStringSync('''
471471
472472
dependency_overrides:
473+
args: ^2.0.0-nullsafety.0
474+
cli_util: ^0.3.0-nullsafety.0
475+
crypto: ^3.0.0-nullsafety.0
476+
glob: ^2.0.0-nullsafety.0
477+
package_config: ^2.0.0-nullsafety.0
478+
pub_semver: ^2.0.0-nullsafety.0
479+
yaml: ^3.0.0-nullsafety.0
473480
analyzer:
474481
path: '${sdkClone.path}/pkg/analyzer'
475482
_fe_analyzer_shared:
@@ -598,6 +605,7 @@ Future<void> startTestPackageDocsServer() async {
598605
log('launching dhttpd on port 8002 for SDK');
599606
var launcher = SubprocessLauncher('serve-test-package-docs');
600607
await launcher.runStreamed(sdkBin('pub'), [
608+
'global',
601609
'run',
602610
'dhttpd',
603611
'--port',
@@ -617,8 +625,8 @@ Future<void> _serveDocsFrom(String servePath, int port, String context) async {
617625
await launcher.runStreamed(sdkBin('pub'), ['global', 'activate', 'dhttpd']);
618626
_serveReady = true;
619627
}
620-
await launcher.runStreamed(
621-
sdkBin('pub'), ['run', 'dhttpd', '--port', '$port', '--path', servePath]);
628+
await launcher.runStreamed(sdkBin('pub'),
629+
['global', 'run', 'dhttpd', '--port', '$port', '--path', servePath]);
622630
}
623631

624632
@Task('Serve generated SDK docs locally with dhttpd on port 8000')
@@ -627,6 +635,7 @@ Future<void> serveSdkDocs() async {
627635
log('launching dhttpd on port 8000 for SDK');
628636
var launcher = SubprocessLauncher('serve-sdk-docs');
629637
await launcher.runStreamed(sdkBin('pub'), [
638+
'global',
630639
'run',
631640
'dhttpd',
632641
'--port',
@@ -668,6 +677,7 @@ Future<void> compareFlutterWarnings() async {
668677
var launcher = SubprocessLauncher('serve-flutter-docs');
669678
await launcher.runStreamed(sdkBin('pub'), ['get']);
670679
Future original = launcher.runStreamed(sdkBin('pub'), [
680+
'global',
671681
'run',
672682
'dhttpd',
673683
'--port',
@@ -676,6 +686,7 @@ Future<void> compareFlutterWarnings() async {
676686
path.join(originalDartdocFlutter.absolute.path, 'dev', 'docs', 'doc'),
677687
]);
678688
Future current = launcher.runStreamed(sdkBin('pub'), [
689+
'global',
679690
'run',
680691
'dhttpd',
681692
'--port',
@@ -694,6 +705,7 @@ Future<void> serveFlutterDocs() async {
694705
var launcher = SubprocessLauncher('serve-flutter-docs');
695706
await launcher.runStreamed(sdkBin('pub'), ['get']);
696707
await launcher.runStreamed(sdkBin('pub'), [
708+
'global',
697709
'run',
698710
'dhttpd',
699711
'--port',

0 commit comments

Comments
 (0)