Skip to content

Adapt sdk-test dependency overrides for non-nullable analyzer #2503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2021
Merged

Adapt sdk-test dependency overrides for non-nullable analyzer #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ca218
Tweak grinder and pubspec from other branch for a more minimalistic a…
jcollins-g Feb 2, 2021
e1bd212
Merge branch 'master' into nnbd-non-migration-second
jcollins-g Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
matrix:
os: [ubuntu-latest]
sdk: [dev, stable]
# Add sdk-analyzer once #2500 is addressed
job: [main, flutter, packages, sdk-docs]
job: [main, flutter, sdk-analyzer, packages, sdk-docs]
include:
- os: macos-latest
sdk: dev
Expand Down
1 change: 0 additions & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ dev_dependencies:
build_version: ^2.0.1
coverage: ^0.14.0
dart_style: ^1.3.9
dhttpd: ^3.0.0
grinder: ^0.8.2
http: ^0.12.0
pedantic: ^1.9.0
Expand Down
16 changes: 14 additions & 2 deletions tool/grind.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,13 @@ Future<String> createSdkDartdoc(bool overrideMeta) async {
dartdocPubspec.writeAsStringSync('''

dependency_overrides:
args: ^2.0.0-nullsafety.0
cli_util: ^0.3.0-nullsafety.0
crypto: ^3.0.0-nullsafety.0
glob: ^2.0.0-nullsafety.0
package_config: ^2.0.0-nullsafety.0
pub_semver: ^2.0.0-nullsafety.0
yaml: ^3.0.0-nullsafety.0
analyzer:
path: '${sdkClone.path}/pkg/analyzer'
_fe_analyzer_shared:
Expand Down Expand Up @@ -598,6 +605,7 @@ Future<void> startTestPackageDocsServer() async {
log('launching dhttpd on port 8002 for SDK');
var launcher = SubprocessLauncher('serve-test-package-docs');
await launcher.runStreamed(sdkBin('pub'), [
'global',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clever fix

'run',
'dhttpd',
'--port',
Expand All @@ -617,8 +625,8 @@ Future<void> _serveDocsFrom(String servePath, int port, String context) async {
await launcher.runStreamed(sdkBin('pub'), ['global', 'activate', 'dhttpd']);
_serveReady = true;
}
await launcher.runStreamed(
sdkBin('pub'), ['run', 'dhttpd', '--port', '$port', '--path', servePath]);
await launcher.runStreamed(sdkBin('pub'),
['global', 'run', 'dhttpd', '--port', '$port', '--path', servePath]);
}

@Task('Serve generated SDK docs locally with dhttpd on port 8000')
Expand All @@ -627,6 +635,7 @@ Future<void> serveSdkDocs() async {
log('launching dhttpd on port 8000 for SDK');
var launcher = SubprocessLauncher('serve-sdk-docs');
await launcher.runStreamed(sdkBin('pub'), [
'global',
'run',
'dhttpd',
'--port',
Expand Down Expand Up @@ -668,6 +677,7 @@ Future<void> compareFlutterWarnings() async {
var launcher = SubprocessLauncher('serve-flutter-docs');
await launcher.runStreamed(sdkBin('pub'), ['get']);
Future original = launcher.runStreamed(sdkBin('pub'), [
'global',
'run',
'dhttpd',
'--port',
Expand All @@ -676,6 +686,7 @@ Future<void> compareFlutterWarnings() async {
path.join(originalDartdocFlutter.absolute.path, 'dev', 'docs', 'doc'),
]);
Future current = launcher.runStreamed(sdkBin('pub'), [
'global',
'run',
'dhttpd',
'--port',
Expand All @@ -694,6 +705,7 @@ Future<void> serveFlutterDocs() async {
var launcher = SubprocessLauncher('serve-flutter-docs');
await launcher.runStreamed(sdkBin('pub'), ['get']);
await launcher.runStreamed(sdkBin('pub'), [
'global',
'run',
'dhttpd',
'--port',
Expand Down