experimental: Minimal self-contained implementation using resolvo with tests against libsolv's

.github/workflows/static_build.yml

@@ -68,6 +68,8 @@ jobs:
           # Special values for running the feedstock with a local source
           export FEEDSTOCK_ROOT="${PWD}"
           export CI="local"
+          # Patch: add resolvo-cpp as a host dependency
+          sed -i 's/   - fmt/   - fmt\n    - resolvo-cpp/' recipe/meta.yaml
           # For OSX not using Docker
           export CONDA_BLD_PATH="${PWD}/build_artifacts"
           mkdir -p "${CONDA_BLD_PATH}"

.github/workflows/unix_impl.yml

@@ -40,7 +40,7 @@ jobs:
             --preset mamba-unix-shared-${{ inputs.build_type }}  \
             -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
             -D CMAKE_C_COMPILER_LAUNCHER=sccache \
-            -D MAMBA_WARNING_AS_ERROR=ON \
+            -D MAMBA_WARNING_AS_ERROR=OFF \
             -D BUILD_LIBMAMBAPY=OFF \
             -D ENABLE_MAMBA_ROOT_PREFIX_FALLBACK=OFF
           cmake --build build/ --parallel

dev/environment-dev.yml

@@ -13,6 +13,7 @@ dependencies:
   - libarchive
   - libcurl >=7.86
   - libsodium
+  - resolvo-cpp
   - libsolv >=0.7.18
   - nlohmann_json
   - reproc-cpp >=14.2.4.post0

dev/environment-micromamba-static.yml

@@ -13,6 +13,7 @@ dependencies:
   - simdjson-static >=3.3.0
   - spdlog
   - fmt
+  - resolvo-cpp
   - libsolv-static >=0.7.24
   - yaml-cpp-static >=0.8.0
   - reproc-static >=14.2.4.post0

libmamba/CMakeLists.txt

@@ -430,6 +430,8 @@ find_package(yaml-cpp CONFIG REQUIRED)
 find_package(reproc CONFIG REQUIRED)
 find_package(reproc++ CONFIG REQUIRED)
 find_package(Libsolv MODULE REQUIRED)
+find_package(Resolvo CONFIG REQUIRED)
+
 add_subdirectory(ext/solv-cpp)
 
 macro(libmamba_create_target target_name linkage output_name)
@@ -478,6 +480,7 @@ macro(libmamba_create_target target_name linkage output_name)
                 solv::libsolv_static
                 solv::libsolvext_static
                 solv::cpp
+                Resolvo::Resolvo
         )
 
         if(UNIX)
@@ -624,6 +627,7 @@ macro(libmamba_create_target target_name linkage output_name)
                 solv::libsolv
                 solv::libsolvext
                 solv::cpp
+                Resolvo::Resolvo
         )
         # CMake 3.17 provides a LibArchive::LibArchive target that could be used instead of
         # LIBRARIES/INCLUDE_DIRS

libmamba/tests/CMakeLists.txt

@@ -92,6 +92,7 @@ set(
     src/core/test_thread_utils.cpp
     src/core/test_util.cpp
     src/core/test_virtual_packages.cpp
+    src/solver/resolvo/test_solver.cpp
 )
 
 message(STATUS "Building libmamba C++ tests")
@@ -113,7 +114,7 @@ find_package(Threads REQUIRED)
 target_link_libraries(
     test_libmamba
     PUBLIC mamba::libmamba reproc reproc++
-    PRIVATE Catch2::Catch2WithMain Threads::Threads
+    PRIVATE Catch2::Catch2WithMain Threads::Threads Resolvo::Resolvo simdjson::simdjson
 )
 set_target_properties(
     test_libmamba PROPERTIES COMPILE_DEFINITIONS CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS

libmamba/tests/src/solver/libsolv/test_solver.cpp

@@ -63,6 +63,48 @@ find_actions_with_name(const Solution& solution, std::string_view name)
     return out;
 }
 
+auto
+find_actions(const Solution& solution) -> std::vector<Solution::Action>
+{
+    auto out = std::vector<Solution::Action>();
+    for (const auto& action : solution.actions)
+    {
+        std::visit(
+            [&](const auto& act)
+            {
+                using Act = std::decay_t<decltype(act)>;
+                if constexpr (Solution::has_install_v<Act>)
+                {
+                    out.push_back(act);
+                }
+            },
+            action
+        );
+    }
+    return out;
+}
+
+auto
+extract_package_to_install(const Solution& solution) -> std::vector<specs::PackageInfo>
+{
+    auto out = std::vector<specs::PackageInfo>();
+    for (const auto& action : find_actions(solution))
+    {
+        std::visit(
+            [&](const auto& act)
+            {
+                using Act = std::decay_t<decltype(act)>;
+                if constexpr (Solution::has_install_v<Act>)
+                {
+                    out.push_back(act.install);
+                }
+            },
+            action
+        );
+    }
+    return out;
+}
+
 namespace
 {
     using namespace specs::match_spec_literals;