diff options
| -rwxr-xr-x | bin/just-mr.py | 4 | ||||
| -rw-r--r-- | src/buildtool/execution_api/local/config.hpp | 4 | ||||
| -rw-r--r-- | test/end-to-end/target-cache/artifacts-sync.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/just-mr.py b/bin/just-mr.py index 119f0e7f..d48f18a0 100755 --- a/bin/just-mr.py +++ b/bin/just-mr.py @@ -268,7 +268,7 @@ def git_hash(content): def add_to_cas(data): if isinstance(data, str): data = data.encode('utf-8') - cas_root = os.path.join(ROOT, "protocol-dependent/git-sha1/casf") + cas_root = os.path.join(ROOT, "protocol-dependent/generation-0/git-sha1/casf") basename = git_hash(data) target = os.path.join(cas_root, basename) tempname = os.path.join(cas_root, "%s.%d" % (basename, os.getpid())) @@ -288,7 +288,7 @@ def add_to_cas(data): def cas_path(h): - return os.path.join(ROOT, "protocol-dependent/git-sha1/casf", h) + return os.path.join(ROOT, "protocol-dependent/generation-0/git-sha1/casf", h) def is_in_cas(h): diff --git a/src/buildtool/execution_api/local/config.hpp b/src/buildtool/execution_api/local/config.hpp index f905fada..c3b526bd 100644 --- a/src/buildtool/execution_api/local/config.hpp +++ b/src/buildtool/execution_api/local/config.hpp @@ -105,8 +105,8 @@ class LocalExecutionConfig { [[nodiscard]] static auto CacheRoot() noexcept -> std::filesystem::path { auto& cache_root = Data().cache_root; if (cache_root.empty()) { - cache_root = - UpdatePathForCompatibility(BuildRoot() / "protocol-dependent"); + cache_root = UpdatePathForCompatibility( + BuildRoot() / "protocol-dependent" / "generation-0"); } return cache_root; } diff --git a/test/end-to-end/target-cache/artifacts-sync.sh b/test/end-to-end/target-cache/artifacts-sync.sh index 5c61a8c1..64003964 100644 --- a/test/end-to-end/target-cache/artifacts-sync.sh +++ b/test/end-to-end/target-cache/artifacts-sync.sh @@ -53,10 +53,10 @@ else if [ "${COMPATIBLE:-}" = "YES" ]; then ARGS="--compatible" - TCDIR="$LBRDIR/protocol-dependent/compatible-sha256/tc" + TCDIR="$LBRDIR/protocol-dependent/generation-0/compatible-sha256/tc" else ARGS="" - TCDIR="$LBRDIR/protocol-dependent/git-sha1/tc" + TCDIR="$LBRDIR/protocol-dependent/generation-0/git-sha1/tc" fi # create common test files |