Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-22 06:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix command line substitutions without any yaml substitutions (#6644)

Browse source
This commit is contained in:
Jesse Hills 2024-04-29 07:33:52 +12:00 committed by GitHub
parent 0ef7781bb3
commit a700ae481d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 5 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/substitutions/__init__.py
View file

@ -116,7 +116,7 @@ def do_substitution_pass(config, command_line_substitutions, ignore_missing=Fals
if CONF_SUBSTITUTIONS not in config and not command_line_substitutions: if CONF_SUBSTITUTIONS not in config and not command_line_substitutions:
return return
substitutions = config[CONF_SUBSTITUTIONS] substitutions = config.get(CONF_SUBSTITUTIONS)
if substitutions is None: if substitutions is None:
substitutions = command_line_substitutions substitutions = command_line_substitutions
elif command_line_substitutions: elif command_line_substitutions:

4
esphome/config.py
View file

@ -756,11 +756,11 @@ def validate_config(
CORE.raw_config = config CORE.raw_config = config
# 1. Load substitutions # 1. Load substitutions
if CONF_SUBSTITUTIONS in config: if CONF_SUBSTITUTIONS in config or command_line_substitutions:
from esphome.components import substitutions from esphome.components import substitutions
result[CONF_SUBSTITUTIONS] = { result[CONF_SUBSTITUTIONS] = {
**config[CONF_SUBSTITUTIONS], **config.get(CONF_SUBSTITUTIONS, {}),
**command_line_substitutions, **command_line_substitutions,
} }
result.add_output_path([CONF_SUBSTITUTIONS], CONF_SUBSTITUTIONS) result.add_output_path([CONF_SUBSTITUTIONS], CONF_SUBSTITUTIONS)

4
script/test_build_components
View file

@ -37,9 +37,9 @@ start_esphome() {
# Start esphome process # Start esphome process
echo "> [$target_component] [$test_name] [$target_platform]" echo "> [$target_component] [$test_name] [$target_platform]"
echo "esphome -s component_name $target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file" echo "esphome -s component_name $target_component -s component_dir ../../components/$target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file"
# TODO: Validate escape of Command line substitution value # TODO: Validate escape of Command line substitution value
esphome -s component_name $target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file esphome -s component_name $target_component -s component_dir ../../components/$target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file
} }
# Find all test yaml files. # Find all test yaml files.

4
tests/test_build_components/build_components_base.bk72xx.yaml
View file

@ -12,8 +12,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-ard.yaml
View file

@ -14,8 +14,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-c3-ard.yaml
View file

@ -14,8 +14,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-c3-idf.yaml
View file

@ -14,8 +14,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-idf.yaml
View file

@ -14,8 +14,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-s2-ard.yaml
View file

@ -15,8 +15,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-s2-idf.yaml
View file

@ -15,8 +15,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-s3-ard.yaml
View file

@ -15,8 +15,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp32-s3-idf.yaml
View file

@ -15,8 +15,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.esp8266.yaml
View file

@ -12,8 +12,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.host.yaml
View file

@ -12,8 +12,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"

4
tests/test_build_components/build_components_base.rp2040.yaml
View file

@ -15,8 +15,4 @@ packages:
component_under_test: !include component_under_test: !include
file: $component_test_file file: $component_test_file
vars: vars:
component_name: $component_name
test_name: $test_name
target_platform: $target_platform
component_test_file: $component_test_file component_test_file: $component_test_file
component_dir: "../../components/$component_name"