From c5357614e4899bd985f77cfdbd676742f53cb0fd Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jakemac@google.com>
Date: Wed, 5 May 2021 18:37:45 +0000
Subject: [PATCH] add package config check to test_matrix.json

Change-Id: Icc8f55c3a58e6b81c3f3b4f34ff07c07d976afd1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/198382
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jake Macdonald <jakemac@google.com>
---
 .dart_tool/package_config.json     | 14 +-------------
 tools/bots/test_matrix.json        | 22 +++++++++++++++-------
 tools/generate_package_config.dart |  3 ++-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index d0ee842309a..fa34add9158 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2021-05-03T18:00:16.673010",
+  "generated": "2021-05-05T10:52:59.908934",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -454,12 +454,6 @@
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
-    {
-      "name": "mustache",
-      "rootUri": "../third_party/pkg/mustache",
-      "packageUri": "lib/",
-      "languageVersion": "2.0"
-    },
     {
       "name": "native_stack_traces",
       "rootUri": "../pkg/native_stack_traces",
@@ -649,12 +643,6 @@
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
-    {
-      "name": "stagehand",
-      "rootUri": "../third_party/pkg/stagehand",
-      "packageUri": "lib/",
-      "languageVersion": "2.10"
-    },
     {
       "name": "status_file",
       "rootUri": "../pkg/status_file",
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index bfa020ba583..39d72729f45 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -3380,6 +3380,21 @@
         "description": "This configuration is used by the release pkg builders."
       },
       "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",
+          "script": "tools/sdks/dart-sdk/bin/dart",
+          "arguments": [
+            "tools/generate_package_config.dart",
+            "--check"
+          ]
+        },
         {
           "name": "build dart",
           "script": "tools/build.py",
@@ -3388,13 +3403,6 @@
             "dartdevc_test"
           ]
         },
-        {
-          "name": "validate pkg/ pubspec files",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "tools/package_deps/bin/package_deps.dart"
-          ]
-        },
         {
           "name": "validate SDK API docs",
           "script": "out/ReleaseX64/dart-sdk/bin/dartdoc",
diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
index 4cf47e04c27..f8791cd7f3a 100644
--- a/tools/generate_package_config.dart
+++ b/tools/generate_package_config.dart
@@ -104,7 +104,8 @@ void main(List<String> args) {
       exit(0);
     } else {
       print("Package config out of date");
-      print("Run `dart tools/generate_package_config.dart` to update");
+      print("Run `gclient sync -D && dart tools/generate_package_config.dart` "
+          "to update.");
       exit(1);
     }
   }