Don't include features from skipped ports in CI runs.

azure-pipelines/e2e-assets/ci-skipped-features/baseline.txt

@@ -0,0 +1,5 @@
+skipped-depends:arm64-osx=skip
+skipped-depends:x64-linux=skip
+skipped-depends:x64-osx=skip
+skipped-depends:x64-windows=skip
+skipped-depends:x86-windows=skip

azure-pipelines/e2e-assets/ci-skipped-features/skipped-depends/portfile.cmake

@@ -0,0 +1 @@
+message(FATAL_ERROR "This port is skipped and should not be attempted.")

azure-pipelines/e2e-assets/ci-skipped-features/skipped-depends/vcpkg.json

@@ -0,0 +1,13 @@
+{
+  "name": "skipped-depends",
+  "version": "1.0.0",
+  "dependencies": [
+    {
+      "name": "skipped-features",
+      "default-features": false,
+      "features": [
+        "fail-if-included"
+      ]
+    }
+  ]
+}

azure-pipelines/e2e-assets/ci-skipped-features/skipped-features/portfile.cmake

@@ -0,0 +1,4 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+if ("fail-if-included" IN_LIST FEATURES)
+    message(FATAL_ERROR "The feature 'fail-if-included' should not be included.")
+endif()

azure-pipelines/e2e-assets/ci-skipped-features/skipped-features/vcpkg.json

@@ -0,0 +1,9 @@
+{
+  "name": "skipped-features",
+  "version": "1.0.0",
+  "features": {
+    "fail-if-included": {
+      "description": "This feature should cause a failure if it is included in the build."
+    }
+  }
+}

azure-pipelines/end-to-end-tests-dir/ci.ps1

@@ -53,6 +53,17 @@ if (-not ($Output.Contains("vcpkg.json:3:17: error: Trailing comma"))) {
 Remove-Problem-Matchers
 $emptyDir = "$TestingRoot/empty"
 New-Item -ItemType Directory -Path $emptyDir -Force | Out-Null
-$Output = Run-VcpkgAndCaptureOutput ci --triplet=$Triplet --x-builtin-ports-root="$emptyDir" --binarysource=clear --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-a" --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-b"
+$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$emptyDir" --binarysource=clear --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-a" --overlay-ports="$PSScriptRoot/../e2e-ports/duplicate-file-b"
 Throw-IfNotFailed
 Restore-Problem-Matchers
+
+# test that features included only by skipped ports are not included
+Remove-Problem-Matchers
+Refresh-TestRoot
+$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-features" --binarysource=clear --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-features/baseline.txt"
+Throw-IfFailed
+if (-not ($Output -match 'skipped-features:[^:]+:        \*' -and $Output -match 'Building skipped-features:[^@][email protected]...')) {
+    throw 'did not attempt to build skipped-features'
+}
+
+Restore-Problem-Matchers

include/vcpkg/base/checks.h

@@ -36,6 +36,7 @@ namespace vcpkg::Checks
     }
 
     // If expression is false, call exit_fail.
+    VCPKG_SAL_ANNOTATION(_Post_satisfies_(_Old_(expression)))
     void check_exit(const LineInfo& line_info, bool expression);
 
     // if expression is false, call exit_with_message.

include/vcpkg/ci-baseline.h

@@ -42,15 +42,8 @@ namespace vcpkg
     {
         std::vector<TripletExclusions> triplets;
 
-        void insert(Triplet triplet);
         void insert(Triplet triplet, SortedVector<std::string>&& exclusions);
-    };
-
-    struct ExclusionPredicate
-    {
-        const ExclusionsMap* data;
-
-        bool operator()(const PackageSpec& spec) const;
+        bool is_excluded(const PackageSpec& spec) const;
     };
 
     std::vector<CiBaselineLine> parse_ci_baseline(StringView text, StringView origin, ParseMessages& messages);

include/vcpkg/commands.install.h

@@ -27,9 +27,24 @@ namespace vcpkg
 
         const BinaryParagraph* get_binary_paragraph() const;
         const PackageSpec& get_spec() const { return m_spec; }
-        Optional<const std::string&> get_abi() const
+        const std::string* package_abi() const
         {
-            return m_install_action ? m_install_action->package_abi() : nullopt;
+            if (m_install_action)
+            {
+                return m_install_action->package_abi();
+            }
+
+            return nullptr;
+        }
+        const std::string& package_abi_or_exit(LineInfo li) const
+        {
+            auto pabi = package_abi();
+            if (!pabi)
+            {
+                Checks::unreachable(li);
+            }
+
+            return *pabi;
         }
         bool is_user_requested_install() const;
         Optional<ExtendedBuildResult> build_result;

include/vcpkg/dependencies.h

@@ -56,7 +56,8 @@ namespace vcpkg
 
         const std::string& public_abi() const;
         bool has_package_abi() const;
-        Optional<const std::string&> package_abi() const;
+        const std::string* package_abi() const;
+        const std::string& package_abi_or_exit(LineInfo li) const;
         const PreBuildInfo& pre_build_info(LineInfo li) const;
         Version version() const;
         std::string display_name() const;

include/vcpkg/fwd/ci-baseline.h

@@ -6,7 +6,6 @@ namespace vcpkg
     struct CiBaselineLine;
     struct TripletExclusions;
     struct ExclusionsMap;
-    struct ExclusionPredicate;
 
     enum class CiBaselineState
     {

src/vcpkg-test/ci-baseline.cpp

@@ -206,8 +206,8 @@ bill-made-up-another-skip:x64-linux=skip)"; // note no trailing newline
     SECTION ("Applies Skips and Fails")
     {
         ExclusionsMap exclusions;
-        exclusions.insert(x64_uwp);   // example triplet
-        exclusions.insert(x64_linux); // example host triplet
+        exclusions.insert(x64_uwp, {}); // example triplet
+        exclusions.insert(x64_linux, {}); // example host triplet
         auto actual = parse_and_apply_ci_baseline(expected_from_example_input, exclusions, SkipFailures::No);
         const SortedVector<PackageSpec> expected_expected_failures{
             PackageSpec{"aubio", x64_uwp},

src/vcpkg/base/checks.cpp

@@ -95,6 +95,7 @@ namespace vcpkg
         exit_fail(line_info);
     }
 
+    VCPKG_SAL_ANNOTATION(_Post_satisfies_(_Old_(expression)))
     void Checks::check_exit(const LineInfo& line_info, bool expression)
     {
         if (!expression)

src/vcpkg/binarycaching.cpp

@@ -426,7 +426,7 @@ namespace
         {
             for (size_t i = 0; i < actions.size(); ++i)
             {
-                const auto& abi_tag = actions[i]->package_abi().value_or_exit(VCPKG_LINE_INFO);
+                const auto& abi_tag = actions[i]->package_abi_or_exit(VCPKG_LINE_INFO);
                 auto archive_path = m_dir / files_archive_subpath(abi_tag);
                 if (m_fs.exists(archive_path, IgnoreErrors{}))
                 {
@@ -440,7 +440,7 @@ namespace
             for (size_t idx = 0; idx < actions.size(); ++idx)
             {
                 const auto& action = *actions[idx];
-                const auto& abi_tag = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
+                const auto& abi_tag = action.package_abi_or_exit(VCPKG_LINE_INFO);
 
                 bool any_available = false;
                 if (m_fs.exists(m_dir / files_archive_subpath(abi_tag), IgnoreErrors{}))
@@ -1008,7 +1008,7 @@ namespace
             for (size_t idx = 0; idx < actions.size(); ++idx)
             {
                 auto&& action = *actions[idx];
-                const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
+                const auto& abi = action.package_abi_or_exit(VCPKG_LINE_INFO);
                 auto tmp = make_temp_archive_path(m_buildtrees, action.spec, abi);
                 auto res = m_tool->download_file(make_object_path(m_prefix, abi), tmp);
                 if (auto cache_result = res.get())
@@ -1030,7 +1030,7 @@ namespace
             for (size_t idx = 0; idx < actions.size(); ++idx)
             {
                 auto&& action = *actions[idx];
-                const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
+                const auto& abi = action.package_abi_or_exit(VCPKG_LINE_INFO);
                 auto maybe_res = m_tool->stat(make_object_path(m_prefix, abi));
                 if (auto res = maybe_res.get())
                 {
@@ -1166,7 +1166,7 @@ namespace
             for (size_t idx = 0; idx < actions.size(); ++idx)
             {
                 auto&& action = *actions[idx];
-                const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
+                const auto& abi = action.package_abi_or_exit(VCPKG_LINE_INFO);
                 abis.push_back(abi);
                 abi_index_map[abi] = idx;
             }
@@ -1225,7 +1225,7 @@ namespace
             for (size_t idx = 0; idx < actions.size(); ++idx)
             {
                 auto&& action = *actions[idx];
-                const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
+                const auto& abi = action.package_abi_or_exit(VCPKG_LINE_INFO);
                 cache_status[idx] =
                     Util::contains(abis, abi) ? CacheAvailability::available : CacheAvailability::unavailable;
             }
@@ -2406,7 +2406,7 @@ namespace vcpkg
             statuses.clear();
             for (size_t i = 0; i < actions.size(); ++i)
             {
-                if (auto abi = actions[i].package_abi().get())
+                if (auto abi = actions[i].package_abi())
                 {
                     CacheStatus& status = m_status[*abi];
                     if (status.should_attempt_restore(provider.get()))
@@ -2441,7 +2441,7 @@ namespace vcpkg
 
     bool ReadOnlyBinaryCache::is_restored(const InstallPlanAction& action) const
     {
-        if (auto abi = action.package_abi().get())
+        if (auto abi = action.package_abi())
         {
             auto it = m_status.find(*abi);
             if (it != m_status.end()) return it->second.is_restored();
@@ -2464,10 +2464,11 @@ namespace vcpkg
 
     std::vector<CacheAvailability> ReadOnlyBinaryCache::precheck(View<const InstallPlanAction*> actions)
     {
-        std::vector<CacheStatus*> statuses = Util::fmap(actions, [this](const auto& action) {
-            Checks::check_exit(VCPKG_LINE_INFO, action && action->package_abi());
-            ASSUME(action);
-            return &m_status[*action->package_abi().get()];
+        std::vector<CacheStatus*> statuses = Util::fmap(actions, [this](const InstallPlanAction* action) {
+            Checks::check_exit(VCPKG_LINE_INFO, action);
+            auto pabi = action->package_abi();
+            Checks::check_exit(VCPKG_LINE_INFO, pabi);
+            return &m_status[*pabi];
         });
 
         std::vector<const InstallPlanAction*> action_ptrs;
@@ -2493,7 +2494,7 @@ namespace vcpkg
 
             for (size_t i = 0; i < action_ptrs.size(); ++i)
             {
-                auto&& this_status = m_status[*action_ptrs[i]->package_abi().get()];
+                auto&& this_status = m_status[action_ptrs[i]->package_abi_or_exit(VCPKG_LINE_INFO)];
                 if (cache_result[i] == CacheAvailability::available)
                 {
                     this_status.mark_available(provider.get());
@@ -2793,7 +2794,7 @@ namespace vcpkg
 
     void BinaryCache::push_success(CleanPackages clean_packages, const InstallPlanAction& action)
     {
-        if (auto abi = action.package_abi().get())
+        if (auto abi = action.package_abi())
         {
             bool restored;
             auto it = m_status.find(*abi);
@@ -3000,7 +3001,7 @@ namespace vcpkg
     }
 
     BinaryPackageReadInfo::BinaryPackageReadInfo(const InstallPlanAction& action)
-        : package_abi(action.package_abi().value_or_exit(VCPKG_LINE_INFO))
+        : package_abi(action.package_abi_or_exit(VCPKG_LINE_INFO))
         , spec(action.spec)
         , display_name(action.display_name())
         , version(action.version())

src/vcpkg/ci-baseline.cpp

@@ -16,19 +16,6 @@ namespace vcpkg
     {
     }
 
-    void ExclusionsMap::insert(Triplet triplet)
-    {
-        for (auto& triplet_exclusions : triplets)
-        {
-            if (triplet_exclusions.triplet == triplet)
-            {
-                return;
-            }
-        }
-
-        triplets.emplace_back(triplet);
-    }
-
     void ExclusionsMap::insert(Triplet triplet, SortedVector<std::string>&& exclusions)
     {
         for (auto& triplet_exclusions : triplets)
@@ -43,9 +30,9 @@ namespace vcpkg
         triplets.emplace_back(triplet, std::move(exclusions));
     }
 
-    bool ExclusionPredicate::operator()(const PackageSpec& spec) const
+    bool ExclusionsMap::is_excluded(const PackageSpec& spec) const
     {
-        for (const auto& triplet_exclusions : data->triplets)
+        for (const auto& triplet_exclusions : triplets)
         {
             if (triplet_exclusions.triplet == spec.triplet())
             {