Skip to content

Commit 4d1546a

Browse files
committed
fix(ci): Cleanup Ci scripts
1 parent c50e462 commit 4d1546a

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

.github/workflows/build_at.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,24 @@ jobs:
5353
5454
build_wrmt_over_at_slave:
5555
if: contains(github.event.pull_request.labels.*.name, 'at') || github.event_name == 'push'
56-
name: Build WiFi Remote over AT Slave
56+
name: Build WRMT-AT Slave
5757
runs-on: ubuntu-latest
5858
steps:
5959
- name: Checkout code
6060
uses: actions/checkout@v3
6161
- name: Checkout esp-protocols
6262
uses: actions/checkout@v3
6363
with:
64-
repository: david-cermak/esp-protocols
65-
ref: feat/modem_sim_params
64+
repository: espressif/esp-protocols
65+
ref: mqtt_cxx-v0.5.0
6666
path: protocols
6767
- name: Checkout idf
6868
uses: actions/checkout@v3
6969
with:
7070
repository: espressif/esp-idf
7171
ref: 8ad0d3d8f2faab752635bee36070313c47c07a13
7272
path: idf
73-
- name: Build ESP-AT
73+
- name: Build modem_sim from esp-protocols
7474
shell: bash
7575
run: |
7676
export IDF_PATH=$GITHUB_WORKSPACE/idf
@@ -93,9 +93,8 @@ jobs:
9393
path: artifacts.zip
9494
if-no-files-found: error
9595

96-
9796
build_wrmt_over_at_host:
98-
name: Build WiFi Remote Example
97+
name: Build WRMT-AT Host
9998
strategy:
10099
matrix:
101100
idf_ver: ["latest"]
@@ -104,28 +103,18 @@ jobs:
104103
steps:
105104
- name: Checkout code
106105
uses: actions/checkout@v3
107-
- name: Checkout protocols
108-
uses: actions/checkout@v3
109-
with:
110-
repository: espressif/esp-protocols
111-
ref: eppp-v1.1.3
112-
sparse-checkout: |
113-
ci/build_apps.py
114-
ci/ignore_build_warnings.txt
115-
ci/clean_build_artifacts.sh
116-
sparse-checkout-cone-mode: false
117-
path: protocols
118106
- name: Build with IDF-${{ matrix.idf_ver }}
119-
env:
120-
EXPECTED_WARNING: "Warning: The smallest app partition is nearly full\nWarning: Deprecated: Option\n"
121107
shell: bash
122108
run: |
123109
${IDF_PATH}/install.sh --enable-ci
124110
. ${IDF_PATH}/export.sh
125111
cd ./components/esp_wifi_remote/examples/mqtt
126112
idf.py add-dependency wifi_remote_over_at
127113
idf.py build -D SDKCONFIG_DEFAULTS=custom.sdkconfig.at
128-
${GITHUB_WORKSPACE}/protocols/ci/clean_build_artifacts.sh `pwd`/build
114+
shopt -s extglob # enable extended globs for selective cleanup
115+
rm -rf build/!(*.bin|*.elf|*.map|bootloader|partition_table|customized_partitions|flasher_args.json|download.config|factory)
116+
if [ -d build/bootloader ]; then rm -rf build/bootloader/!(*.bin); fi
117+
if [ -d build/partition_table ]; then rm -rf build/partition_table/!(*.bin); fi
129118
zip -qur artifacts.zip build
130119
- uses: actions/upload-artifact@v4
131120
with:

components/esp_wifi_remote/examples/mqtt/custom.sdkconfig.at

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ CONFIG_ESP_WIFI_PASSWORD="local_mosquitto_password"
88
CONFIG_WIFI_RMT_AT_UART_TX_PIN=47
99
CONFIG_WIFI_RMT_AT_UART_RX_PIN=48
1010
CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
11+
CONFIG_BROKER_URL="mqtt://192.168.4.1"

components/esp_wifi_remote/examples/pytest_eppp.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ def test_wifi_remote_eppp(dut: Tuple[IdfDut, IdfDut]) -> None:
2121
# Check for wifi station connected event (different for hosted and eppp)
2222
if dut[1].app.sdkconfig.get('ESP_WIFI_REMOTE_LIBRARY_HOSTED') is True:
2323
server.expect('slave_rpc: Sta mode connected', timeout=100)
24+
elif dut[1].app.sdkconfig.get('ESP_WIFI_REMOTE_LIBRARY_CUSTOM') is True:
25+
server.expect('Got IPv4 event: Interface', timeout=100)
2426
else:
2527
server.expect('rpc_server: Received WIFI event 4', timeout=100)
2628
client.expect('MQTT_EVENT_CONNECTED', timeout=100)

0 commit comments

Comments
 (0)