Add option to remove unaffected ports from ci action (#210)

* Add option to remove unchanged leaf ports from `ci`

* Format source code

* [commands.ci] Combine plan reduction passes

* [commands.ci] Check for missing abi field

* Restore exclusion of excluded dependencies. Fix code analysis.

Co-authored-by: Robert Schumacher <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>

Author: 3 people

src/vcpkg/commands.ci.cpp

@@ -93,14 +93,17 @@ namespace vcpkg::Commands::CI
     static constexpr StringLiteral OPTION_XUNIT = "x-xunit";
     static constexpr StringLiteral OPTION_RANDOMIZE = "x-randomize";
     static constexpr StringLiteral OPTION_OUTPUT_HASHES = "output-hashes";
+    static constexpr StringLiteral OPTION_PARENT_HASHES = "parent-hashes";
     static constexpr StringLiteral OPTION_SKIPPED_CASCADE_COUNT = "x-skipped-cascade-count";
 
-    static constexpr std::array<CommandSetting, 6> CI_SETTINGS = {
+    static constexpr std::array<CommandSetting, 7> CI_SETTINGS = {
         {{OPTION_EXCLUDE, "Comma separated list of ports to skip"},
          {OPTION_HOST_EXCLUDE, "Comma separated list of ports to skip for the host triplet"},
          {OPTION_XUNIT, "File to output results in XUnit format (internal)"},
          {OPTION_FAILURE_LOGS, "Directory to which failure logs will be copied"},
          {OPTION_OUTPUT_HASHES, "File to output all determined package hashes"},
+         {OPTION_PARENT_HASHES,
+          "File to read package hashes for a parent CI state, to reduce the set of changed packages"},
          {OPTION_SKIPPED_CASCADE_COUNT,
           "Asserts that the number of --exclude and supports skips exactly equal this number"}}};
 
@@ -404,13 +407,16 @@ namespace vcpkg::Commands::CI
 
     // This algorithm reduces an action plan to only unknown actions and their dependencies
     static void reduce_action_plan(Dependencies::ActionPlan& action_plan,
-                                   const std::map<PackageSpec, Build::BuildResult>& known)
+                                   const std::map<PackageSpec, Build::BuildResult>& known,
+                                   View<std::string> parent_hashes)
     {
         std::set<PackageSpec> to_keep;
         for (auto it = action_plan.install_actions.rbegin(); it != action_plan.install_actions.rend(); ++it)
         {
             auto it_known = known.find(it->spec);
-            if (it_known == known.end())
+            const auto& abi = it->abi_info.value_or_exit(VCPKG_LINE_INFO).package_abi;
+            auto it_parent = std::find(parent_hashes.begin(), parent_hashes.end(), abi);
+            if (it_known == known.end() && it_parent == parent_hashes.end())
             {
                 to_keep.insert(it->spec);
             }
@@ -421,8 +427,11 @@ namespace vcpkg::Commands::CI
                 {
                     it->plan_type = InstallPlanType::EXCLUDED;
                 }
-                it->build_options = vcpkg::Build::backcompat_prohibiting_package_options;
-                to_keep.insert(it->package_dependencies.begin(), it->package_dependencies.end());
+                else
+                {
+                    it->build_options = vcpkg::Build::backcompat_prohibiting_package_options;
+                    to_keep.insert(it->package_dependencies.begin(), it->package_dependencies.end());
+                }
             }
         }
 
@@ -580,7 +589,24 @@ namespace vcpkg::Commands::CI
             }
         }
 
-        reduce_action_plan(action_plan, split_specs->known);
+        std::vector<std::string> parent_hashes;
+
+        auto it_parent_hashes = settings.find(OPTION_PARENT_HASHES);
+        if (it_parent_hashes != settings.end())
+        {
+            const Path parent_hashes_path = paths.original_cwd / it_parent_hashes->second;
+            auto parsed_json = Json::parse_file(VCPKG_LINE_INFO, filesystem, parent_hashes_path);
+            parent_hashes = Util::fmap(parsed_json.first.array(), [](const auto& json_object) {
+                auto abi = json_object.object().get("abi");
+                Checks::check_exit(VCPKG_LINE_INFO, abi);
+#ifdef _MSC_VER
+                _Analysis_assume_(abi);
+#endif
+                return abi->string().to_string();
+            });
+        }
+
+        reduce_action_plan(action_plan, split_specs->known, parent_hashes);
 
         vcpkg::printf("Time to determine pass/fail: %s\n", timer.elapsed());