Skip to content

Commit e53dca8

Browse files
authored
CI: Add idf_target for esp_example.sh script (#32809)
* CI: Add idf_target for esp_example.sh script * review changes * fix ci build for lock app
1 parent a7839b0 commit e53dca8

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

.github/workflows/examples-esp32.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ jobs:
9090
rm -rf ./zzz_pregenerated
9191
mv scripts/codegen.py.renamed scripts/codegen.py
9292
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
93-
- name: Build example All Clusters App C3
94-
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_c3devkit.defaults
93+
- name: Build example All Clusters App(Target:ESP32C3)
94+
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
9595
- name: Copy aside build products
9696
run: |
9797
mkdir -p example_binaries/esp32-build
@@ -106,10 +106,10 @@ jobs:
106106
run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
107107

108108
- name: Build example Lighting App (Target:ESP32H2)
109-
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2
109+
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
110110

111111
- name: Build example Lock App (Target:ESP32C6)
112-
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6
112+
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
113113

114114
- name: Uploading Size Reports
115115
uses: ./.github/actions/upload-size-reports
@@ -155,10 +155,13 @@ jobs:
155155
run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
156156

157157
- name: Build example Light Switch App (Target:ESP32C3)
158-
run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3
158+
run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3 esp32c3
159159

160160
- name: Build example Lighting App (external platform)
161161
run: scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
162162

163163
- name: Build example Energy Management App
164164
run: scripts/examples/esp_example.sh energy-management-app sdkconfig.defaults
165+
166+
- name: Build example LIT ICD App (Target:ESP32H2)
167+
run: scripts/examples/esp_example.sh lit-icd-app sdkconfig.defaults esp32h2

examples/platform/esp32/lock/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#define APP_LOCK_BUTTON GPIO_NUM_34
2828
#define APP_FUNCTION_BUTTON GPIO_NUM_35
29-
#elif CONFIG_IDF_TARGET_ESP32C3
29+
#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
3030
#define SYSTEM_STATE_LED GPIO_NUM_8
3131
#define LOCK_STATE_LED GPIO_NUM_9
3232

scripts/build/builders/esp32.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def DefaultsFileName(board: Esp32Board, app: Esp32App, enable_rpcs: bool):
139139
else:
140140
return 'sdkconfig{}.defaults'.format(rpc)
141141
elif board == Esp32Board.C3DevKit:
142-
return 'sdkconfig_c3devkit{}.defaults'.format(rpc)
142+
return 'sdkconfig{}.defaults.esp32c3'.format(rpc)
143143
else:
144144
raise Exception('Unknown board type')
145145

scripts/examples/esp_example.sh

+11-7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ env
2121

2222
app="$1"
2323
sdkconfig_name="$2"
24+
idf_target="$3"
2425
root=examples/$app/esp32
2526

2627
shift 1
@@ -30,16 +31,16 @@ if [ -z "$app" ]; then
3031
exit 1
3132
fi
3233

33-
source "$IDF_PATH/export.sh"
34-
source "scripts/activate.sh"
35-
# shellcheck source=/dev/null
34+
supported_idf_target=("esp32" "esp32c3" "esp32c2" "esp32c6" "esp32s3" "esp32h2")
3635

37-
if [ "$sdkconfig_name" == "sdkconfig_c3devkit.defaults" ]; then
38-
idf_target="esp32c3"
39-
else
36+
if [ -z "$idf_target" ] || [[ ! "${supported_idf_target[*]}" =~ "$idf_target" ]]; then
4037
idf_target="esp32"
4138
fi
4239

40+
source "$IDF_PATH/export.sh"
41+
source "scripts/activate.sh"
42+
# shellcheck source=/dev/null
43+
4344
rm -f "$root"/sdkconfig
4445
(
4546
cd "$root"
@@ -48,4 +49,7 @@ rm -f "$root"/sdkconfig
4849
echo "build $sdkconfig_name failed"
4950
exit 1
5051
}
51-
cp "$root"/build/chip-"$app".elf "$root"/build/"${sdkconfig_name%".defaults"}"-chip-"$app".elf
52+
53+
project_name=$(grep -o 'project([^)]*)' "$root"/CMakeLists.txt | sed 's/project(\(.*\))/\1/')
54+
55+
cp "$root"/build/"$project_name".elf "$root"/build/"${sdkconfig_name%".defaults"}"-"$project_name".elf

0 commit comments

Comments
 (0)