Skip to content

Commit 22e1757

Browse files
committedMay 16, 2021
builders: report hash errors as failures
1 parent 231953b commit 22e1757

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed
 

Diff for: ‎ofborg/src/message/buildresult.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub enum BuildStatus {
88
Success,
99
Failure,
1010
TimedOut,
11+
HashMismatch,
1112
UnexpectedError { err: String },
1213
}
1314

@@ -17,6 +18,7 @@ impl From<BuildStatus> for String {
1718
BuildStatus::Skipped => "No attempt".into(),
1819
BuildStatus::Success => "Success".into(),
1920
BuildStatus::Failure => "Failure".into(),
21+
BuildStatus::HashMismatch => "A fixed output derivation's hash was incorrect".into(),
2022
BuildStatus::TimedOut => "Timed out, unknown build status".into(),
2123
BuildStatus::UnexpectedError { ref err } => format!("Unexpected error: {}", err),
2224
}
@@ -29,6 +31,7 @@ impl From<BuildStatus> for Conclusion {
2931
BuildStatus::Skipped => Conclusion::Neutral,
3032
BuildStatus::Success => Conclusion::Success,
3133
BuildStatus::Failure => Conclusion::Neutral,
34+
BuildStatus::HashMismatch => Conclusion::Failure,
3235
BuildStatus::TimedOut => Conclusion::Neutral,
3336
BuildStatus::UnexpectedError { .. } => Conclusion::Neutral,
3437
}

Diff for: ‎ofborg/src/nix.rs

+1
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ pub fn wait_for_build_status(spawned: SpawnedAsyncCmd) -> BuildStatus {
365365
Some(0) => BuildStatus::Success,
366366
Some(100) => BuildStatus::Failure, // nix permanent failure
367367
Some(101) => BuildStatus::TimedOut, // nix build timedout
368+
Some(102) => BuildStatus::HashMismatch, // Fixed Output Derivation's hash was wrong
368369
Some(i) => BuildStatus::UnexpectedError {
369370
err: format!("command failed with exit code {}", i),
370371
},

0 commit comments

Comments
 (0)
Please sign in to comment.