Skip to content

Commit a416b03

Browse files
authored
Use meta at HEAD when using analyzer at HEAD (#2323)
* Use meta at HEAD when using analyzer at HEAD * Skip sdk-analyzer on stable
1 parent 02ed83c commit a416b03

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ matrix:
1616
allow_failures:
1717
# See https://github.com/dart-lang/dartdoc/issues/2302.
1818
- env: DARTDOC_BOT=flutter
19+
# Some packages at HEAD require 2.10.0-dev.
20+
- env: DARTDOC_BOT=sdk-analyzer
21+
dart: stable
1922

2023
env:
2124
jobs:

tool/grind.dart

+7-3
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,11 @@ Future<String> createComparisonDartdoc() async {
431431
return dartdocClean.path;
432432
}
433433

434-
/// Helper function to create a clean version of dartdoc (based on the current
435-
/// directory, assumed to be a git repository), configured to use the head
436-
/// version of the Dart SDK for analyzer, front-end, and kernel.
434+
/// Creates a clean version of dartdoc (based on the current directory, assumed
435+
/// to be a git repository), configured to use packages from the Dart SDK.
436+
///
437+
/// This copy of dartdoc depends on the HEAD versions of various packages
438+
/// developed within the SDK, such as 'analyzer' and 'meta'.
437439
Future<String> createSdkDartdoc() async {
438440
var launcher = SubprocessLauncher('create-sdk-dartdoc');
439441
var dartdocSdk = Directory.systemTemp.createTempSync('dartdoc-sdk');
@@ -471,6 +473,8 @@ dependency_overrides:
471473
path: '${sdkClone.path}/pkg/analyzer'
472474
_fe_analyzer_shared:
473475
path: '${sdkClone.path}/pkg/_fe_analyzer_shared'
476+
meta:
477+
path: '${sdkClone.path}/pkg/meta'
474478
''', mode: FileMode.append);
475479
await launcher.runStreamed(sdkBin('pub'), ['get'],
476480
workingDirectory: dartdocSdk.path);

0 commit comments

Comments
 (0)