Skip to content

Commit 1389894

Browse files
Damian-Nordicpull[bot]
authored andcommitted
Fix mbed build on master (#16010)
* Revert "CI split between master (full) and PR (smoke) for MbedOS (#15587)" This reverts commit bfa2e6b. * Skip mbed build steps depending on modified paths * Fix build
1 parent df40638 commit 1389894

File tree

3 files changed

+22
-86
lines changed

3 files changed

+22
-86
lines changed

.github/workflows/full-mbed.yaml renamed to .github/workflows/examples-mbed.yaml

+21-4
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: Full builds - Mbed OS
15+
name: Build example - Mbed OS
1616

1717
on:
1818
push:
19+
pull_request:
1920
workflow_dispatch:
2021

2122
concurrency:
22-
group: full-${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
23+
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2324
cancel-in-progress: true
2425

2526
jobs:
2627
mbedos:
27-
name: Run
28+
name: Mbed OS examples building
2829
timeout-minutes: 200
2930

3031
env:
32+
BUILD_TYPE: mbedos
3133
APP_PROFILE: release
3234
APP_TARGET: CY8CPROTO_062_4343W
3335

@@ -50,6 +52,16 @@ jobs:
5052
attempt_limit: 3
5153
attempt_delay: 2000
5254

55+
- name: Detect changed paths
56+
uses: dorny/paths-filter@v2
57+
id: changed_paths
58+
with:
59+
filters: |
60+
mbed:
61+
- '**/mbed/**'
62+
pigweedapp:
63+
- 'examples/pigweed-app/mbed/**'
64+
5365
- name: Set up environment for size reports
5466
if: ${{ !env.ACT }}
5567
env:
@@ -79,6 +91,7 @@ jobs:
7991
/tmp/bloat_reports/
8092
8193
- name: Build lighting-app example
94+
if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
8295
timeout-minutes: 20
8396
run: |
8497
scripts/examples/mbed_example.sh -a=lighting-app -b=$APP_TARGET -p=$APP_PROFILE
@@ -88,6 +101,7 @@ jobs:
88101
/tmp/bloat_reports/
89102
90103
- name: Build pigweed-app example
104+
if: github.event_name == 'push' || steps.changed_paths.outputs.pigweedapp == 'true'
91105
timeout-minutes: 20
92106
run: |
93107
scripts/examples/mbed_example.sh -a=pigweed-app -b=$APP_TARGET -p=$APP_PROFILE
@@ -97,6 +111,7 @@ jobs:
97111
/tmp/bloat_reports/
98112
99113
- name: Build all-clusters-app example
114+
if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
100115
timeout-minutes: 20
101116
run: |
102117
scripts/examples/mbed_example.sh -a=all-clusters-app -b=$APP_TARGET -p=$APP_PROFILE
@@ -106,6 +121,7 @@ jobs:
106121
/tmp/bloat_reports/
107122
108123
- name: Build shell example
124+
if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
109125
timeout-minutes: 20
110126
run: |
111127
scripts/examples/mbed_example.sh -a=shell -b=$APP_TARGET -p=$APP_PROFILE
@@ -115,14 +131,15 @@ jobs:
115131
/tmp/bloat_reports/
116132
117133
- name: Build ota-requestor-app example
134+
if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
118135
timeout-minutes: 20
119136
run: |
120137
scripts/examples/mbed_example.sh -a=ota-requestor-app -b=$APP_TARGET -p=$APP_PROFILE
121138
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
122139
mbed $APP_TARGET+$APP_PROFILE shell \
123140
examples/ota-requestor-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-ota-requestor-app-example.elf \
124141
/tmp/bloat_reports/
125-
142+
126143
- name: Build unit tests
127144
# Temporarily disable build due to running out of flash space
128145
if: false

.github/workflows/smoketest-mbed.yaml

-82
This file was deleted.

examples/platform/mbed/util/include/DFUManager.h

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#ifdef CHIP_OTA_REQUESTOR
3030
#include <BDXDownloader.h>
31+
#include <DefaultOTARequestorStorage.h>
3132
#include <OTAImageProcessorImpl.h>
3233
#include <OTARequestor.h>
3334
#include <OTARequestorDriverImpl.h>

0 commit comments

Comments
 (0)