Skip to content

Commit c4c1691

Browse files
committed
Allow overriding (with unsetting) in config files
1 parent a087a19 commit c4c1691

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1515

1616
### Fixed
1717
- Spaces in the names of project directores no longer cause unit test binaries to fail execution
18+
- Configuration file overrides with `nil`s (or empty arrays) now properly override their base configuration
1819

1920
### Security
2021

lib/arduino_ci/ci_config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def validate_data(rootname, source, schema)
9393
if !schema.include?(ksym)
9494
puts "Warning: unknown field '#{ksym}' under definition for #{rootname}"
9595
elsif value.nil?
96-
# unspecificed, that's fine
96+
good_data[ksym] = nil
9797
elsif value.class != expected_type
9898
puts "Warning: expected field '#{ksym}' of #{rootname} to be '#{expected_type}', got '#{value.class}'"
9999
else

0 commit comments

Comments
 (0)