diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-10 18:16:39 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-13 14:41:00 +0200 |
| commit | ed8f24fb246142ffaa88707ae86b53c34df82986 (patch) | |
| tree | 302cd1fef8b8847ceeffd5d5d2c5b33539eabc88 /src/buildtool/execution_engine/executor | |
| parent | 76ab9217628084c661176118d5a8020a3366f04c (diff) | |
| download | justbuild-ed8f24fb246142ffaa88707ae86b53c34df82986.tar.gz | |
Move to GitHashesConverter functionality related to conversion of git hashes
...from Compatibility.
Diffstat (limited to 'src/buildtool/execution_engine/executor')
| -rw-r--r-- | src/buildtool/execution_engine/executor/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/execution_engine/executor/executor.hpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS index fb407a8d..f24030b2 100644 --- a/src/buildtool/execution_engine/executor/TARGETS +++ b/src/buildtool/execution_engine/executor/TARGETS @@ -26,6 +26,7 @@ , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/common", "git_hashes_converter"] ] , "stage": ["src", "buildtool", "execution_engine", "executor"] } diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp index 556e47c0..1d94d2ca 100644 --- a/src/buildtool/execution_engine/executor/executor.hpp +++ b/src/buildtool/execution_engine/executor/executor.hpp @@ -30,6 +30,7 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/git_hashes_converter.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/common/tree.hpp" #include "src/buildtool/compatibility/compatibility.hpp" @@ -437,7 +438,8 @@ class ExecutorImpl { gsl::not_null<const RepositoryConfig*> const& repo_config, Artifact::ObjectInfo const& info) noexcept -> bool { if (Compatibility::IsCompatible()) { - auto opt = Compatibility::GetGitEntry(info.digest.hash()); + auto opt = + GitHashesConverter::Instance().GetGitEntry(info.digest.hash()); if (opt) { auto const& [git_sha1_hash, comp_repo] = *opt; return VerifyOrUploadGitArtifact( |