Skip to content

Commit 6eab181

Browse files
authored
fix: is_dirty to use additional_files (#268)
- when checking for missing artifacts avoid checking files within artifacts / out directory - otherwise files like `/home/george/work/foundry-issues/issue-preproc/out/Base.sol/CommonBase.json` are checked and erroneously flag missing extra files / rebuild sources - will add test in foundry with such cases and assert the number of files built
1 parent b1b9e58 commit 6eab181

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

crates/compilers/src/artifact_output/configurable.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl ArtifactOutput for ConfigurableArtifacts {
232232
ir_optimized_ast,
233233
} = contract;
234234

235-
if self.additional_values.metadata {
235+
if self.additional_values.metadata || self.additional_files.metadata {
236236
if let Some(LosslessMetadata { raw_metadata, metadata }) = metadata {
237237
artifact_raw_metadata = Some(raw_metadata);
238238
artifact_metadata = Some(metadata);
@@ -244,13 +244,13 @@ impl ArtifactOutput for ConfigurableArtifacts {
244244
if self.additional_values.devdoc {
245245
artifact_devdoc = Some(devdoc);
246246
}
247-
if self.additional_values.ewasm {
247+
if self.additional_values.ewasm || self.additional_files.ewasm {
248248
artifact_ewasm = ewasm;
249249
}
250-
if self.additional_values.ir {
250+
if self.additional_values.ir || self.additional_files.ir {
251251
artifact_ir = ir;
252252
}
253-
if self.additional_values.ir_optimized {
253+
if self.additional_values.ir_optimized || self.additional_files.ir_optimized {
254254
artifact_ir_optimized = ir_optimized;
255255
}
256256
if self.additional_values.ir_optimized_ast {
@@ -293,11 +293,11 @@ impl ArtifactOutput for ConfigurableArtifacts {
293293
if self.additional_values.gas_estimates {
294294
artifact_gas_estimates = gas_estimates;
295295
}
296-
if self.additional_values.assembly {
296+
if self.additional_values.assembly || self.additional_files.assembly {
297297
artifact_assembly = assembly;
298298
}
299299

300-
if self.additional_values.legacy_assembly {
300+
if self.additional_values.legacy_assembly || self.additional_files.legacy_assembly {
301301
artifact_legacy_assembly = legacy_assembly;
302302
}
303303
}

0 commit comments

Comments
 (0)