mirror of
https://github.com/logos-co/logos-module-builder.git
synced 2026-08-27 18:21:16 +00:00
fix(tests): thread qt-sdk/protocol roots into mkLogosModuleTests
logos-test-framework's LogosTest.cmake now resolves three SDK roots (qt split); the test builder passes -DLOGOS_QT_SDK_ROOT / -DLOGOS_PROTOCOL_ROOT and the packages on buildInputs. flake.lock pins logos-test-framework to its qt-split branch (logos-co/logos-test-framework#4) — temporary, drop when the chain merges. Verified: the test-framework-integration check passes locally with these changes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
e87f47aa9d
commit
b24c2b079f
Generated
+63
-3
@@ -4149,6 +4149,31 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"logos-protocol_2": {
|
||||
"inputs": {
|
||||
"logos-nix": [
|
||||
"logos-test-framework",
|
||||
"logos-nix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"logos-test-framework",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781065710,
|
||||
"narHash": "sha256-QmNQ7LdrfzyvsZGISGKJKbHqB03F6JExgGF2K1f2WcE=",
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-protocol",
|
||||
"rev": "ca28190272eef2772edf9b3e1df47e121f02a726",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-protocol",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"logos-qt-mcp": {
|
||||
"inputs": {
|
||||
"logos-nix": "logos-nix_34",
|
||||
@@ -4255,6 +4280,39 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"logos-qt-sdk_2": {
|
||||
"inputs": {
|
||||
"logos-cpp-sdk": [
|
||||
"logos-test-framework",
|
||||
"logos-cpp-sdk"
|
||||
],
|
||||
"logos-nix": [
|
||||
"logos-test-framework",
|
||||
"logos-nix"
|
||||
],
|
||||
"logos-protocol": [
|
||||
"logos-test-framework",
|
||||
"logos-protocol"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"logos-test-framework",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781066423,
|
||||
"narHash": "sha256-3pVeJ/cK2z4OEi5iLORjoC7YpdrRrHmigl9SyvEapI8=",
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-qt-sdk",
|
||||
"rev": "355774603877637b486ea0aeefbf7828ae321868",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-qt-sdk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"logos-standalone-app": {
|
||||
"inputs": {
|
||||
"logos-capability-module": "logos-capability-module",
|
||||
@@ -4424,6 +4482,8 @@
|
||||
"logos-cpp-sdk"
|
||||
],
|
||||
"logos-nix": "logos-nix_111",
|
||||
"logos-protocol": "logos-protocol_2",
|
||||
"logos-qt-sdk": "logos-qt-sdk_2",
|
||||
"nixpkgs": [
|
||||
"logos-test-framework",
|
||||
"logos-nix",
|
||||
@@ -4431,11 +4491,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780432542,
|
||||
"narHash": "sha256-LcZnXuNTCyFQS7rhOHF3sy+oF6PNq/H1MLPHch08XrU=",
|
||||
"lastModified": 1781118884,
|
||||
"narHash": "sha256-bM8Deqf6soZeUqWy3RdyY0APRKLWmjD/78g1fbEObaY=",
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-test-framework",
|
||||
"rev": "ee081954096f602b47308c6dc7d00fb71d5dcdc7",
|
||||
"rev": "5b8fcc9ffdc5c66511a95a6bf6b41dd74fbbacc9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ let
|
||||
# Import the test builder
|
||||
mkLogosModuleTests = import ./mkLogosModuleTests.nix {
|
||||
inherit nixpkgs lib common parseMetadata;
|
||||
inherit logos-cpp-sdk logos-test-framework;
|
||||
inherit logos-cpp-sdk logos-protocol logos-qt-sdk logos-test-framework;
|
||||
};
|
||||
|
||||
in {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# flakeInputs = inputs;
|
||||
# mockCLibs = ["gowalletsdk"]; # optional
|
||||
# };
|
||||
{ nixpkgs, lib, common, parseMetadata, logos-cpp-sdk, logos-test-framework }:
|
||||
{ nixpkgs, lib, common, parseMetadata, logos-cpp-sdk, logos-protocol, logos-qt-sdk, logos-test-framework }:
|
||||
|
||||
let
|
||||
modulePreConfigure = import ./modulePreConfigure.nix { inherit lib; };
|
||||
@@ -60,6 +60,8 @@ let
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
logosSdk = logos-cpp-sdk.packages.${system}.default;
|
||||
logosQtSdk = logos-qt-sdk.packages.${system}.default;
|
||||
logosProtocolPkg = logos-protocol.packages.${system}.default;
|
||||
testFramework = logos-test-framework.packages.${system}.default;
|
||||
|
||||
# Resolve runtime packages from metadata (e.g. nlohmann_json)
|
||||
@@ -147,6 +149,8 @@ let
|
||||
qt6.qtbase
|
||||
qt6.qtremoteobjects
|
||||
logosSdk
|
||||
logosQtSdk
|
||||
logosProtocolPkg
|
||||
testFramework
|
||||
] ++ runtimePkgs;
|
||||
|
||||
@@ -176,6 +180,8 @@ let
|
||||
mkdir -p build && cd build
|
||||
cmake ../${testDirName} \
|
||||
-DLOGOS_CPP_SDK_ROOT=${logosSdk} \
|
||||
-DLOGOS_QT_SDK_ROOT=${logosQtSdk} \
|
||||
-DLOGOS_PROTOCOL_ROOT=${logosProtocolPkg} \
|
||||
-DLOGOS_TEST_FRAMEWORK_ROOT=${testFramework} \
|
||||
-DCMAKE_MODULE_PATH=${testFramework}/cmake \
|
||||
${lib.optionalString (externalLibRpath != "") "-DCMAKE_INSTALL_RPATH=${externalLibRpath} -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"} \
|
||||
|
||||
Reference in New Issue
Block a user