mirror of
https://github.com/dart-lang/sdk
synced 2024-09-18 21:11:19 +00:00
Revert "[infra] Temporarily remove package_deps.dart from the test matrix"
* This reverts commit c04a71e455
.
* Fix pkg/compiler pubspec.yaml to work with package_deps script and
`dart pub get`.
Fixes https://github.com/dart-lang/sdk/issues/46877.
Reason for revert: Duplicate dart2js_info has been removed from DEPS.
TEST=dart pub get in pkg/compiler.
Original change's description:
> [infra] Temporarily remove package_deps.dart from the test matrix
>
> It currently fails because pkg/dart2js_info isn't wired up, yet.
>
> Change-Id: I10a2d43385fe3d900a62fa7438ed37b9e366dffb
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/209902
> Reviewed-by: William Hesse <whesse@google.com>
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I35e642d1adb931fff665d48f7f51c31c070ff180
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/210680
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
This commit is contained in:
parent
b44250c3f6
commit
b7f320714c
|
@ -12,7 +12,8 @@ dependencies:
|
||||||
# Published packages - repo version ensured via dependency_overrides
|
# Published packages - repo version ensured via dependency_overrides
|
||||||
collection: any
|
collection: any
|
||||||
crypto: any
|
crypto: any
|
||||||
dart2js_info: any
|
dart2js_info:
|
||||||
|
path: ../dart2js_info
|
||||||
front_end:
|
front_end:
|
||||||
path: ../front_end
|
path: ../front_end
|
||||||
kernel:
|
kernel:
|
||||||
|
@ -56,8 +57,14 @@ dev_dependencies:
|
||||||
|
|
||||||
dependency_overrides:
|
dependency_overrides:
|
||||||
# Packages with source in the SDK
|
# Packages with source in the SDK
|
||||||
|
_fe_analyzer_shared:
|
||||||
|
path: ../_fe_analyzer_shared
|
||||||
|
analyzer:
|
||||||
|
path: ../analyzer
|
||||||
front_end:
|
front_end:
|
||||||
path: ../front_end
|
path: ../front_end
|
||||||
|
js:
|
||||||
|
path: ../js
|
||||||
kernel:
|
kernel:
|
||||||
path: ../kernel
|
path: ../kernel
|
||||||
meta:
|
meta:
|
||||||
|
@ -91,9 +98,7 @@ dependency_overrides:
|
||||||
path:
|
path:
|
||||||
path: ../../third_party/pkg/path
|
path: ../../third_party/pkg/path
|
||||||
protobuf:
|
protobuf:
|
||||||
path: ../../third_party/pkg/protobuf
|
path: ../../third_party/pkg/protobuf/protobuf
|
||||||
quiver:
|
|
||||||
path: ../../third_party/pkg/quiver
|
|
||||||
shelf:
|
shelf:
|
||||||
path: ../../third_party/pkg/shelf
|
path: ../../third_party/pkg/shelf
|
||||||
shelf_static:
|
shelf_static:
|
||||||
|
@ -106,6 +111,10 @@ dependency_overrides:
|
||||||
path: ../../third_party/pkg/stream_channel
|
path: ../../third_party/pkg/stream_channel
|
||||||
string_scanner:
|
string_scanner:
|
||||||
path: ../../third_party/pkg/string_scanner
|
path: ../../third_party/pkg/string_scanner
|
||||||
|
test:
|
||||||
|
path: ../../third_party/pkg/test/pkgs/test
|
||||||
|
test_api:
|
||||||
|
path: ../../third_party/pkg/test/pkgs/test_api
|
||||||
typed_data:
|
typed_data:
|
||||||
path: ../../third_party/pkg/typed_data
|
path: ../../third_party/pkg/typed_data
|
||||||
yaml:
|
yaml:
|
||||||
|
|
|
@ -3472,6 +3472,13 @@
|
||||||
"description": "This configuration is used by the release pkg builders."
|
"description": "This configuration is used by the release pkg builders."
|
||||||
},
|
},
|
||||||
"steps": [
|
"steps": [
|
||||||
|
{
|
||||||
|
"name": "validate pkg/ pubspec files",
|
||||||
|
"script": "tools/sdks/dart-sdk/bin/dart",
|
||||||
|
"arguments": [
|
||||||
|
"tools/package_deps/bin/package_deps.dart"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "validate .dart_tool/package_config.json",
|
"name": "validate .dart_tool/package_config.json",
|
||||||
"script": "tools/sdks/dart-sdk/bin/dart",
|
"script": "tools/sdks/dart-sdk/bin/dart",
|
||||||
|
|
Loading…
Reference in a new issue