Test --skip-failures and fix "static" cascade (#1871)

dg0yt · web-flow · commit 3536bb04e644 · 2025-12-03T10:21:37.000-08:00
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/baseline.fail.txt b/azure-pipelines/e2e-assets/ci-skipped-ports/baseline.fail.txt
@@ -0,0 +1,17 @@
+# fail means skip with --skip-failures
+always-skip:cross=fail
+always-skip:arm64-linux=fail
+always-skip:arm64-osx=fail
+always-skip:x64-linux=fail
+always-skip:x64-osx=fail
+always-skip:x64-windows=fail
+always-skip:x86-windows=fail
+
+# fail means skip here, but cached artifacts may exist
+# not skipping maybe-skip for "cross" triplet
+maybe-skip:arm64-linux=fail
+maybe-skip:arm64-osx=fail
+maybe-skip:x64-linux=fail
+maybe-skip:x64-osx=fail
+maybe-skip:x64-windows=fail
+maybe-skip:x86-windows=fail
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/baseline.skip.txt b/azure-pipelines/e2e-assets/ci-skipped-ports/baseline.skip.txt
@@ -0,0 +1,13 @@
+# actual test
+always-skip:arm64-osx=skip
+always-skip:x64-linux=skip
+always-skip:x64-osx=skip
+always-skip:x64-windows=skip
+always-skip:x86-windows=skip
+
+# don't build cached artifact
+maybe-transitive-cascade:arm64-osx=skip
+maybe-transitive-cascade:x64-linux=skip
+maybe-transitive-cascade:x64-osx=skip
+maybe-transitive-cascade:x64-windows=skip
+maybe-transitive-cascade:x86-windows=skip
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/baseline.txt b/azure-pipelines/e2e-assets/ci-skipped-ports/baseline.txt
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-cross-cascade/portfile.cmake b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-cross-cascade/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-cross-cascade/vcpkg.json b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-cross-cascade/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "maybe-cross-cascade",
+  "version": "1.0.0",
+  "dependencies": [
+    {
+      "name": "maybe-skip",
+      "host": true
+    }
+  ]
+}
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-direct-cascade/portfile.cmake b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-direct-cascade/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-direct-cascade/vcpkg.json b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-direct-cascade/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "maybe-direct-cascade",
+  "version": "1.0.0",
+  "dependencies": [
+    "maybe-skip"
+  ]
+}
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-skip/portfile.cmake b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-skip/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-skip/vcpkg.json b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-skip/vcpkg.json
@@ -0,0 +1,4 @@
+{
+  "name": "maybe-skip",
+  "version": "1.0.0"
+}
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-transitive-cascade/portfile.cmake b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-transitive-cascade/portfile.cmake
@@ -0,0 +1,4 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/share/maybe-skip")
+    message(FATAL_ERROR "Installation order violation")
+endif()
diff --git a/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-transitive-cascade/vcpkg.json b/azure-pipelines/e2e-assets/ci-skipped-ports/maybe-transitive-cascade/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "maybe-transitive-cascade",
+  "version": "1.0.0",
+  "dependencies": [
+    "maybe-direct-cascade"
+  ]
+}
diff --git a/azure-pipelines/end-to-end-tests-dir/ci.ps1 b/azure-pipelines/end-to-end-tests-dir/ci.ps1
@@ -93,26 +93,79 @@ SUMMARY FOR $Triplet
 
 # test that skipped ports aren't "put back" by downstream dependencies that aren't skipped
 Refresh-TestRoot
-$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-ports" --binarysource=clear --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-ports/baseline.txt"
+$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-ports" --binarysource="clear;files,$ArchiveRoot,readwrite" --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-ports/baseline.skip.txt"
 Throw-IfFailed
 if (-not ($Output -match 'always-built:[^:]+:      \*:' -and $Output -match 'Building always-built:[^@]+@1\.0\.0\.\.\.')) {
     throw 'did not attempt to build always-built'
 }
 if (-not ($Output -match 'always-skip:[^:]+: skip\n')) {
-    throw 'tried to build skipped'
+    throw 'did not identify always-skip as skipped'
+}
+if (-not ($Output -match 'always-cascade:[^:]+: cascade\n')) {
+    throw 'did not identify always-cascade as cascaded'
 }
-# This should be statically determinable but at the moment we do not
-# if (-not ($Output -match 'always-cascade:[^:]+: cascade\n')) {
-#     throw 'tried to build cascaded'
-# }
 Throw-IfNonContains -Actual $Output -Expected @"
 SUMMARY FOR $Triplet
-  SUCCEEDED: 1
+  SUCCEEDED: 4
   CASCADED_DUE_TO_MISSING_DEPENDENCIES: 1
-  EXCLUDED: 1
+  EXCLUDED: 2
 "@
+# prerequisite for next tests
+if (-not ($Output -match 'maybe-transitive-cascade:[^:]+: skip\n')) {
+    throw 'did not identify maybe-transitive-cascade as skip'
+}
+if (-not ($Output -match 'maybe-cross-cascade:[^:]+:      \*:' -and $Output -match 'Building maybe-cross-cascade:[^@]+@1\.0\.0\.\.\.')) {
+    throw 'did not attempt to build maybe-cross-cascade'
+}
+# test with --skip-failures and cached artifacts
+Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue
+New-Item -ItemType Directory -Path $installRoot -Force | Out-Null
+$Output = Run-VcpkgAndCaptureOutput ci --skip-failures @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-ports" --binarysource="clear;files,$ArchiveRoot" --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-ports/baseline.fail.txt"
+Throw-IfFailed
+if (-not ($Output -match 'always-built:[^:]+: cached:') -or $Output -match 'Building always-built:[^@]+@1\.0\.0\.\.\.') {
+    throw 'did not reuse the cached artifact for always-built'
+}
+if (-not ($Output -match 'always-skip:[^:]+: skip\n')) {
+    throw 'did not identify always-skip as skipped'
+}
+if (-not ($Output -match 'always-cascade:[^:]+: cascade\n')) {
+    throw 'did not identify always-cascade as cascaded'
+}
+if (-not ($Output -match 'maybe-skip:[^:]+: skip\n')) {
+    throw 'did not identify maybe-skip as skipped'
+}
+# not cached and transitive dependency on maybe-skip which is excluded
+if (-not ($Output -match 'maybe-transitive-cascade:[^:]+: cascade\n')) {
+    throw 'did not identify maybe-transitive-cascade as cascaded'
+}
+# cached, but direct dependency on maybe-skip which is excluded
+if (-not ($Output -match 'maybe-cross-cascade:[^:]+: cascade\n')) {
+    throw 'did not identify maybe-cross-cascade as cascaded'
+}
+# test cross build; skipping always-skip and host maybe-skip
+Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue
+New-Item -ItemType Directory -Path $installRoot -Force | Out-Null
+Copy-Item "$env:VCPKG_ROOT/triplets/$Triplet.cmake" "$installRoot/cross.cmake"
+$Output = Run-VcpkgAndCaptureOutput ci --dry-run --skip-failures --triplet cross --overlay-triplets $installRoot @directoryArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-ports" --binarysource=clear --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-ports/baseline.fail.txt"
+Throw-IfFailed
+if (-not ($Output -match 'always-built:cross:      \*:')) {
+    throw 'did not attempt to build always-built [cross build]'
+}
+if (-not ($Output -match 'always-cascade:cross: cascade\n')) {
+    throw 'did not identify always-cascade as cascaded [cross build]'
+}
+if (-not ($Output -match 'maybe-skip:cross:      \*:')) {
+    throw 'did not attempt to build maybe-skip [cross build]'
+}
+if (-not ($Output -match 'maybe-transitive-cascade:cross:      \*:')) {
+    throw 'did not attempt to build maybe-transitive-cascade [cross build]'
+}
+if (-not ($Output -match 'maybe-cross-cascade:cross: cascade\n')) {
+    throw 'did not identify maybe-cross-cascade as cascaded [cross build]'
+}
 
 # test that features included only by skipped ports are not included
+Refresh-TestRoot
 $xunitFile = Join-Path $TestingRoot 'xunit.xml'
 Refresh-TestRoot
 Remove-Problem-Matchers
diff --git a/src/vcpkg/commands.ci.cpp b/src/vcpkg/commands.ci.cpp
@@ -83,6 +83,30 @@ namespace
         return supports_expression.evaluate(var_provider.get_dep_info_vars(spec).value_or_exit(VCPKG_LINE_INFO));
     }
 
+    bool cascade_for_triplet(const std::vector<InstallPlanAction>& install_actions,
+                             const Triplet& target_triplet,
+                             const SortedVector<std::string>* target_triplet_exclusions,
+                             const Triplet& host_triplet,
+                             const SortedVector<std::string>* host_triplet_exclusions)
+    {
+        return std::any_of(install_actions.begin(), install_actions.end(), [&](const InstallPlanAction& action) {
+            if (target_triplet_exclusions && action.spec.triplet() == target_triplet)
+                return target_triplet_exclusions->contains(action.spec.name());
+            if (host_triplet_exclusions && action.spec.triplet() == host_triplet)
+                return host_triplet_exclusions->contains(action.spec.name());
+            return false;
+        });
+    }
+
+    const SortedVector<std::string>* find_triplet_exclusions(const ExclusionsMap& exclusions_map,
+                                                             const Triplet& triplet)
+    {
+        auto it = Util::find_if(exclusions_map.triplets, [&triplet](const TripletExclusions& exclusions) {
+            return exclusions.triplet == triplet;
+        });
+        return it == exclusions_map.triplets.end() ? nullptr : &it->exclusions;
+    }
+
     ActionPlan compute_full_plan(const VcpkgPaths& paths,
                                  const PortFileProvider& provider,
                                  const CMakeVars::CMakeVarProvider& var_provider,
@@ -299,6 +323,7 @@ namespace
 
     CiSpecsResult calculate_ci_specs(const ExclusionsMap& exclusions_map,
                                      const Triplet& target_triplet,
+                                     const Triplet& host_triplet,
                                      PortFileProvider& provider,
                                      const CMakeVars::CMakeVarProvider& var_provider,
                                      const CreateInstallPlanOptions& serialize_options)
@@ -308,11 +333,10 @@ namespace
         // it is too late as we have already calculated an action plan with feature dependencies from
         // the skipped ports.
         CiSpecsResult result;
-        auto it = Util::find_if(exclusions_map.triplets, [&](const TripletExclusions& exclusions) {
-            return exclusions.triplet == target_triplet;
-        });
         const SortedVector<std::string>* const target_triplet_exclusions =
-            it == exclusions_map.triplets.end() ? nullptr : &it->exclusions;
+            find_triplet_exclusions(exclusions_map, target_triplet);
+        const SortedVector<std::string>* const host_triplet_exclusions =
+            (host_triplet == target_triplet) ? nullptr : find_triplet_exclusions(exclusions_map, host_triplet);
         auto all_control_files = provider.load_all_control_files();
 
         // populate `var_provider` to evaluate supports expressions for all ports:
@@ -332,9 +356,9 @@ namespace
             }
 
             PackagesDirAssigner this_packages_dir_not_used{""};
-            if (!create_feature_install_plan(
-                     provider, var_provider, {&full_package_spec, 1}, {}, this_packages_dir_not_used, serialize_options)
-                     .unsupported_features.empty())
+            const ActionPlan action_plan = create_feature_install_plan(
+                provider, var_provider, {&full_package_spec, 1}, {}, this_packages_dir_not_used, serialize_options);
+            if (!action_plan.unsupported_features.empty())
             {
                 result.excluded.insert_or_assign(
                     std::move(full_package_spec.package_spec),
@@ -344,6 +368,16 @@ namespace
                 continue;
             }
 
+            if (cascade_for_triplet(action_plan.install_actions,
+                                    target_triplet,
+                                    target_triplet_exclusions,
+                                    host_triplet,
+                                    host_triplet_exclusions))
+            {
+                result.excluded.insert_or_assign(std::move(full_package_spec.package_spec), ExcludeReason::Cascade);
+                continue;
+            }
+
             result.requested.emplace_back(std::move(full_package_spec));
         }
 
@@ -487,8 +521,8 @@ namespace vcpkg
         }
         CreateInstallPlanOptions create_install_plan_options(
             randomizer.get(), host_triplet, UnsupportedPortAction::Warn, UseHeadVersion::No, Editable::No);
-        auto ci_specs =
-            calculate_ci_specs(exclusions_map, target_triplet, provider, var_provider, create_install_plan_options);
+        auto ci_specs = calculate_ci_specs(
+            exclusions_map, target_triplet, host_triplet, provider, var_provider, create_install_plan_options);
 
         PackagesDirAssigner packages_dir_assigner{paths.packages()};
         auto action_plan = compute_full_plan(

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "name": "maybe-skip",
 +  "version": "1.0.0"
 +}