Skip to content

Commit

Permalink
Merge branch 'ci/add_variable_to_manage_different_sdkconfig' into 'ma…
Browse files Browse the repository at this point in the history 
…ster'

ci: Added a variable to manage different sdkconfig file

See merge request application/esp-at!1552
  • Loading branch information
@xcguang
xcguang committed Apr 18, 2024
2 parents f594828 + b60dc10 commit 0d86365
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 46 deletions.
85 changes: 43 additions & 42 deletions .gitlab/ci/build_template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# common build template #
#########################
.speedup_repo_clone: &speedup_repo_clone
- get_module_cfg_dir
- sed -i "s?https://github.com?$GITLAB_SSH_SERVER?g" module_config/${module_cfg_dir}/IDF_VERSION
- get_module_configs
- sed -i "s?https://github.com?$GITLAB_SSH_SERVER?g" ${module_cfg_dir}/IDF_VERSION

.setup_env_variables: &setup_env_variables
- export HAS_IDF_PREREQUISITES=1
Expand Down Expand Up @@ -103,58 +103,58 @@
# Update sdkconfig.defaults #
#############################
.enable_all_wifi_cmds: &enable_all_wifi_cmds
- echo -e "CONFIG_AT_WS_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_FS_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_DRIVER_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_EAP_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WEB_SERVER_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WEB_CAPTIVE_PORTAL_ENABLE=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WS_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_FS_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_DRIVER_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_EAP_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_WEB_SERVER_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_WEB_CAPTIVE_PORTAL_ENABLE=y" >> ${at_sdkconfig_file}

.disable_all_wifi_cmds: &disable_all_wifi_cmds
- echo -e "CONFIG_AT_WS_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_FS_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_ETHERNET_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_EAP_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_DRIVER_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WEB_SERVER_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WEB_CAPTIVE_PORTAL_ENABLE=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_OTA_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_MDNS_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WPS_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_SMARTCONFIG_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_PING_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_MQTT_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_HTTP_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_SIGNALING_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_ESP_WIFI_SLP_IRAM_OPT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_WS_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_FS_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_ETHERNET_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_EAP_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_DRIVER_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_WEB_SERVER_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_WEB_CAPTIVE_PORTAL_ENABLE=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_OTA_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_MDNS_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_WPS_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_SMARTCONFIG_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_PING_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_MQTT_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_HTTP_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_SIGNALING_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_ESP_WIFI_SLP_IRAM_OPT=n" >> ${at_sdkconfig_file}

.enable_ethernet_cmds: &enable_ethernet_cmds
- echo -e "CONFIG_AT_ETHERNET_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_ETHERNET_SUPPORT=y" >> ${at_sdkconfig_file}

.enable_bt_cmds: &enable_bt_cmds
- echo -e "CONFIG_AT_BT_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BT_SPP_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BT_A2DP_COMMAND_SUPPORT=y" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BT_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_BT_SPP_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_BT_A2DP_COMMAND_SUPPORT=y" >> ${at_sdkconfig_file}

.disable_ble_cmds: &disable_ble_cmds
- echo -e "CONFIG_AT_BLE_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BLE_HID_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BLUFI_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BT_COMMAND_SUPPORT=n" >> module_config/${module_cfg_dir}/sdkconfig.defaults
- echo -e "CONFIG_AT_BLE_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_BLE_HID_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_BLUFI_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}
- echo -e "CONFIG_AT_BT_COMMAND_SUPPORT=n" >> ${at_sdkconfig_file}

.enable_40mhz_xtal: &enable_40mhz_xtal
- echo -e "CONFIG_XTAL_FREQ_40=y" >> module_config/module_esp32c2_default/sdkconfig.defaults
- echo -e "CONFIG_XTAL_FREQ_40=y" >> ${at_sdkconfig_file}

#########################
# Enlarge app partition #
#########################
.enlarge_app_partition: &enlarge_app_partition
- app0_size=`cat module_config/${module_cfg_dir}/partitions_at.csv | grep ota_0 | awk -F, '{print $5}'`
- app1_size=`cat module_config/${module_cfg_dir}/partitions_at.csv | grep ota_1 | awk -F, '{print $5}'`
- app0_size=`cat ${module_cfg_dir}/partitions_at.csv | grep ota_0 | awk -F, '{print $5}'`
- app1_size=`cat ${module_cfg_dir}/partitions_at.csv | grep ota_1 | awk -F, '{print $5}'`
- to_set_size=$((app0_size + app1_size))
- sed -i '/ota_1/d' module_config/${module_cfg_dir}/partitions_at.csv
- sed -i '/ota_1/d' ${module_cfg_dir}/partitions_at.csv
- to_set_hex_size=`printf "0x%x" ${to_set_size}`
- sed -i '/ota_0/s,'"$app0_size"','"$to_set_hex_size"',g' module_config/${module_cfg_dir}/partitions_at.csv
- sed -i '/ota_0/s,'"$app0_size"','"$to_set_hex_size"',g' ${module_cfg_dir}/partitions_at.csv

##################
# Before scripts #
Expand Down Expand Up @@ -187,7 +187,7 @@
before_script:
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
- add_gitlab_ssh_keys
- get_module_cfg_dir
- get_module_configs
- *setup_tokens_esp32
- *enable_all_wifi_cmds
- *disable_ble_cmds
Expand All @@ -197,7 +197,7 @@
before_script:
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
- add_gitlab_ssh_keys
- get_module_cfg_dir
- get_module_configs
- *setup_tokens_esp32
- *enable_bt_cmds
- *disable_all_wifi_cmds
Expand All @@ -207,7 +207,7 @@
before_script:
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
- add_gitlab_ssh_keys
- get_module_cfg_dir
- get_module_configs
- *setup_tokens_esp32
- *enable_ethernet_cmds
- *enlarge_app_partition
Expand All @@ -216,22 +216,23 @@
before_script:
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
- add_gitlab_ssh_keys
- get_module_configs
- *setup_tokens_esp32c2
- *enable_40mhz_xtal

.before_script_esp32c2_enable_all_wifi_cmds:
before_script:
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
- add_gitlab_ssh_keys
- get_module_cfg_dir
- get_module_configs
- *setup_tokens_esp32c2
- *enable_all_wifi_cmds

.before_script_esp32c3_enable_all_wifi_cmds:
before_script:
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
- add_gitlab_ssh_keys
- get_module_cfg_dir
- get_module_configs
- *setup_tokens_esp32c3
- *enable_all_wifi_cmds
- *enlarge_app_partition
Expand Down
18 changes: 14 additions & 4 deletions .gitlab/ci/utils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,27 @@ function add_doc_server_ssh_keys() {
echo -e "Host ${server_url}\n\tStrictHostKeyChecking no\n\tUser ${server_user}\n" >>~/.ssh/config
}

function get_module_cfg_dir() {
function get_module_configs() {
module_name_lower=$(echo "${MODULE_NAME}" | tr '[:upper:]' '[:lower:]')
module_cfg_dir="${CI_PROJECT_DIR}/module_config/module_${module_name_lower}"

# module config directory
if [ ! -d "${module_cfg_dir}" ]; then
platform_name_str=$(echo "${PLATFORM}" | sed 's/PLATFORM_//')
module_name_lower=$(echo "${platform_name_str}" | tr '[:upper:]' '[:lower:]')
module_cfg_dir="module_${module_name_lower}_default"
module_cfg_dir="${CI_PROJECT_DIR}/module_config/module_${module_name_lower}_default"
else
module_cfg_dir="module_${module_name_lower}"
module_cfg_dir="${CI_PROJECT_DIR}/module_config/module_${module_name_lower}"
fi

echo "current configuration dir: ${module_cfg_dir}"

# sdkconfig file
if [ "$SILENCE" = "0" ]; then
at_sdkconfig_file="${module_cfg_dir}/sdkconfig.defaults"
elif [ "$SILENCE" = "1" ]; then
at_sdkconfig_file="${module_cfg_dir}/sdkconfig_silence.defaults"
else
at_sdkconfig_file="na"
fi
echo "current sdkconfig file: ${at_sdkconfig_file}"
}

0 comments on commit 0d86365

Please sign in to comment.