Skip to content

Commit f84e76a

Browse files
Merge pull request #251 from espressif/feat/ci_apply_sdkconfig_ci_settings
feat(ci): Build app with multiple sdkconfigs
2 parents 055f3fc + 6f74f07 commit f84e76a

File tree

9 files changed

+19
-21
lines changed

9 files changed

+19
-21
lines changed

.github/ci/.idf_build_examples_config.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ target = "all"
1212
# build related options
1313
build_dir = "build_@t_@w"
1414
work_dir = "@f_@t_@w"
15+
16+
# config rules
17+
config_rules = [
18+
'sdkconfig.ci=default',
19+
'sdkconfig.ci.*=',
20+
'=default',
21+
]

.github/workflows/build_and_run_host_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
shell: bash
2828
run: |
2929
. ${IDF_PATH}/export.sh
30-
pip install pytest pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf pyusb idf-build-apps==2.4.3 --upgrade
30+
pip install pytest pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf pyusb idf-build-apps==2.12.2 --upgrade
3131
- name: Build
3232
shell: bash
3333
run: |
@@ -38,4 +38,4 @@ jobs:
3838
shell: bash
3939
run: |
4040
. ${IDF_PATH}/export.sh
41-
pytest --target=linux -m host_test --build-dir=build_linux
41+
pytest --target=linux -m host_test --build-dir=build_linux_default

.github/workflows/build_and_run_test_app_usb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
run: |
6262
. ${IDF_PATH}/export.sh
6363
git config --global safe.directory $(pwd)
64-
pip install idf-build-apps==2.4.3 --upgrade
64+
pip install idf-build-apps==2.12.2 --upgrade
6565
export PEDANTIC_FLAGS="-DIDF_CI_BUILD -Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
6666
export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
6767
export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
@@ -138,4 +138,4 @@ jobs:
138138
PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi/"
139139
run: pip install --only-binary cryptography pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf pyserial pyusb
140140
- name: Run USB Test App on target
141-
run: pytest --target=${{ matrix.idf_target }} -m ${{ matrix.runner_tag }} --build-dir=build_${{ matrix.idf_target }}
141+
run: pytest --target=${{ matrix.idf_target }} -m ${{ matrix.runner_tag }} --build-dir=build_${{ matrix.idf_target }}_default

.github/workflows/build_idf_examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
shell: bash
4040
run: |
4141
. ${IDF_PATH}/export.sh
42-
pip install idf-component-manager>=2.1.2 idf-build-apps==2.4.3 pyyaml --upgrade
42+
pip install idf-component-manager>=2.1.2 idf-build-apps==2.12.2 pyyaml --upgrade
4343
- name: Build ESP-IDF ${{ matrix.idf_ver }} USB examples
4444
shell: bash
4545
run: |

.idf_build_apps.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,10 @@ check_warnings = true
88

99
# build related options
1010
build_dir = "build_@t_@w"
11+
12+
# config rules
13+
config_rules = [
14+
'sdkconfig.ci=default',
15+
'sdkconfig.ci.*=',
16+
'=default',
17+
]

host/class/uvc/usb_host_uvc/examples/basic_uvc_stream/sdkconfig.defaults

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Espressif IoT Development Framework (ESP-IDF) 5.4.0 Project Minimal Configuration
33
#
44
CONFIG_IDF_TARGET="esp32p4"
5-
CONFIG_BOOTLOADER_LOG_COLORS=y
65
CONFIG_ESP32P4_REV_MIN_0=y
76
CONFIG_RTC_CLK_SRC_EXT_CRYS=y
87
CONFIG_RTC_CLK_CAL_CYCLES=1024

host/usb/test/target_test/ext_port/sdkconfig.ci

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@
22
CONFIG_USB_HOST_TEST_HUB_PORT_NUM_DEVICE_FSHS=1
33
CONFIG_USB_HOST_TEST_HUB_PORT_NUM_DEVICE_LS=2
44
CONFIG_USB_HOST_TEST_HUB_PORT_NUM_EMPTY=3
5-
6-
# Use external power switch to control USB device's power
7-
# switch is controlled by GPIO 21
8-
CONFIG_USB_PHY_TEST_OTG_DRVVBUS_ENABLE=y
9-
CONFIG_USB_PHY_TEST_OTG_DRVVBUS_GPIO=21
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +0,0 @@
1-
# Use external power switch to control USB device's power
2-
# switch is controlled by GPIO 21
3-
4-
CONFIG_USB_PHY_TEST_OTG_DRVVBUS_ENABLE=y
5-
CONFIG_USB_PHY_TEST_OTG_DRVVBUS_GPIO=21

host/usb/test/target_test/usb_host/sdkconfig.ci

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)