Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/builtins/src/pluginfs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ fn emit_glob_file(
source_path,
out_path: rel_str.to_string(),
x: fh.exec,
// Workspace source file: durable for the build, so the engine can
// reference it by path instead of tar-packing it into the cache.
passthrough: true,
}),
hashout: fh.hashout.clone(),
});
Expand Down Expand Up @@ -955,6 +958,9 @@ impl hplugin::driver::Driver for Driver {
source_path,
out_path: path.clone(),
x: fh.exec,
// Workspace source file: durable for the build, so the
// engine references it by path instead of tar-packing it.
passthrough: true,
}),
hashout: fh.hashout.clone(),
}],
Expand Down
7 changes: 4 additions & 3 deletions crates/engine/src/engine/request_state.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use crate::engine::Engine;
use crate::engine::error::{CycleError, TargetFailure};
use crate::engine::local_cache::CacheArtifact;
use crate::engine::meta::ResultMeta;
use crate::engine::provider::State;
use crate::engine::result::{ArtifactMeta, ExtendedTargetDef, LockedResolution, OutputMatcher};
use crate::engine::result::{
ArtifactMeta, ExtendedTargetDef, LockedResolution, OutputMatcher, ResultArtifact,
};
use crate::engine::spec::EngineTargetSpec;
use hcore::hasync::StdCancellationToken;
use hcore::hmemoizer::Memoizer;
Expand All @@ -16,7 +17,7 @@ use std::ops::Deref;
use std::sync::{Arc, Weak};

type ArcErr = Arc<anyhow::Error>;
type ExecuteCacheResult = Result<(Vec<CacheArtifact>, Vec<ArtifactMeta>), ArcErr>;
type ExecuteCacheResult = Result<(Vec<ResultArtifact>, Vec<ArtifactMeta>), ArcErr>;
type ProbeStatesResult = Result<Arc<Vec<State>>, ArcErr>;

/// Pointer-keyed map entry for `DepDag` nodes.
Expand Down
Loading
Loading