Skip to content

Commit bdb29d4

Browse files
nicholaslyangnicholaslyang
authored andcommitted
Got task hashes to match!
1 parent 472e701 commit bdb29d4

File tree

10 files changed

+10
-12
lines changed

10 files changed

+10
-12
lines changed

cli/internal/context/context.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,13 @@ func BuildPackageGraph(repoRoot turbopath.AbsoluteSystemPath, rootPackageJSON *f
169169
TurboConfigs: map[string]*fs.TurboJSON{},
170170
}
171171
c.RootNode = core.ROOT_NODE_NAME
172-
173172
var warnings Warnings
174173

175174
packageManager, err := packagemanager.GetPackageManager(packageManagerName)
176175
if err != nil {
177176
return nil, err
178177
}
179178
c.PackageManager = packageManager
180-
181179
if err := c.resolveWorkspaceRootDeps(rootPackageJSON, &warnings); err != nil {
182180
// TODO(Gaspar) was this the intended return error?
183181
return nil, fmt.Errorf("could not resolve workspaces: %w", err)
@@ -186,7 +184,6 @@ func BuildPackageGraph(repoRoot turbopath.AbsoluteSystemPath, rootPackageJSON *f
186184
// Get the workspaces from the package manager.
187185
// workspaces are absolute paths
188186
workspaces, err := c.PackageManager.GetWorkspaces(repoRoot)
189-
190187
if err != nil {
191188
return nil, fmt.Errorf("workspace configuration error: %w", err)
192189
}
@@ -212,7 +209,6 @@ func BuildPackageGraph(repoRoot turbopath.AbsoluteSystemPath, rootPackageJSON *f
212209
return c.populateWorkspaceGraphForPackageJSON(pkg, rootpath, pkg.Name, &warnings)
213210
})
214211
}
215-
216212
if err := populateGraphWaitGroup.Wait(); err != nil {
217213
return nil, err
218214
}
@@ -224,7 +220,6 @@ func BuildPackageGraph(repoRoot turbopath.AbsoluteSystemPath, rootPackageJSON *f
224220
return nil, fmt.Errorf("failed to resolve dependencies for root package: %v", err)
225221
}
226222
c.WorkspaceInfos.PackageJSONs[util.RootPkgName] = rootPackageJSON
227-
228223
if err := c.populateExternalDeps(repoRoot, rootPackageJSON, &warnings); err != nil {
229224
return nil, err
230225
}

cli/internal/fs/hash.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ func HashFileHashes(hashes FileHashes) (string, error) {
3232

3333
// HashTask produces the hash for a particular task
3434
func HashTask(task *hash.TaskHashable) (string, error) {
35+
fmt.Printf("%+v\n", task)
3536
return hash.HashTaskHashable(task)
3637
}
3738

cli/internal/fs/hash/capnp.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,6 @@ func HashMessage(msg *capnp.Message) (string, error) {
378378
return "", err
379379
}
380380

381-
println(hex.EncodeToString(bytes))
382-
383381
digest := xxhash.New()
384382
_, err = digest.Write(bytes)
385383
if err != nil {

cli/internal/run/real_run.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,6 @@ func RealRun(
286286
expectedTaskHashes := taskHashTracker.GetTaskHashes()
287287
if !reflect.DeepEqual(executionState.TaskHashTracker.PackageTaskHashes, expectedTaskHashes) {
288288
return fmt.Errorf("task hashes differ between Rust and Go: rust %v go %v", executionState.TaskHashTracker.PackageTaskHashes, expectedTaskHashes)
289-
} else {
290-
fmt.Println("task hashes are identical between Rust and Go!")
291289
}
292290
}
293291

cli/internal/run/run.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ func (r *run) run(ctx gocontext.Context, targets []string, executionState *turbo
164164
} else {
165165
pkgDepGraph, err = context.BuildPackageGraph(r.base.RepoRoot, rootPackageJSON, executionState.PackageManager)
166166
}
167+
167168
if err != nil {
168169
var warnings *context.Warnings
169170
if errors.As(err, &warnings) {

crates/turborepo-env/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use thiserror::Error;
1414
const DEFAULT_ENV_VARS: [&str; 1] = ["VERCEL_ANALYTICS_ID"];
1515

1616
/// Environment mode after we've resolved the `Infer` variant
17+
#[derive(Debug)]
1718
pub enum ResolvedEnvMode {
1819
Loose,
1920
Strict,

crates/turborepo-lib/src/hash/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ mod proto_capnp {
4242
}
4343
}
4444

45+
#[derive(Debug)]
4546
pub struct TaskHashable<'a> {
4647
// hashes
4748
pub(crate) global_hash: &'a str,

crates/turborepo-lib/src/hash/proto.capnp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ struct TaskHashable {
2222
dotEnv @12 :List(Text);
2323

2424
enum EnvMode {
25-
loose @0;
26-
strict @1;
25+
infer @0;
26+
loose @1;
27+
strict @2;
2728
}
2829
}
2930

crates/turborepo-lib/src/run/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ impl Run {
354354
);
355355

356356
visitor.visit(engine.clone()).await?;
357-
358357
let task_hash_tracker = visitor.into_task_hash_tracker();
359358

360359
Ok((global_hash, task_hash_tracker))

crates/turborepo-lib/src/task_hash.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@ impl<'a> TaskHasher<'a> {
304304
env_mode: task_env_mode,
305305
dot_env: &task_definition.dot_env,
306306
};
307+
308+
println!("task hashable: {:#?}", task_hashable);
309+
307310
let task_hash = task_hashable.hash();
308311

309312
let mut task_hash_tracker = self.task_hash_tracker.lock().await;

0 commit comments

Comments
 (0)