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
project-chip · Mar 9, 2022 · 9f7dc81 · 9f7dc81
1 parent b6e4b58
commit 9f7dc81
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 86 deletions.
diff --git a/.github/workflows/full-mbed.yaml → .github/workflows/examples-mbed.yaml b/.github/workflows/full-mbed.yaml → .github/workflows/examples-mbed.yaml
@@ -12,22 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Full builds - Mbed OS
+name: Build example - Mbed OS
 
 on:
     push:
+    pull_request:
     workflow_dispatch:
 
 concurrency:
-    group: full-${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
     cancel-in-progress: true
 
 jobs:
     mbedos:
-        name: Run
+        name: Mbed OS examples building
         timeout-minutes: 200
 
         env:
+            BUILD_TYPE: mbedos
             APP_PROFILE: release
             APP_TARGET: CY8CPROTO_062_4343W
 
@@ -50,6 +52,16 @@ jobs:
                   attempt_limit: 3
                   attempt_delay: 2000
 
+            - name: Detect changed paths
+              uses: dorny/paths-filter@v2
+              id: changed_paths
+              with:
+                  filters: |
+                      mbed:
+                        - '**/mbed/**'
+                      pigweedapp:
+                        - 'examples/pigweed-app/mbed/**'
+
             - name: Set up environment for size reports
               if: ${{ !env.ACT }}
               env:
@@ -79,6 +91,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: Build lighting-app example
+              if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
               timeout-minutes: 20
               run: |
                   scripts/examples/mbed_example.sh -a=lighting-app -b=$APP_TARGET -p=$APP_PROFILE
@@ -88,6 +101,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: Build pigweed-app example
+              if: github.event_name == 'push' || steps.changed_paths.outputs.pigweedapp == 'true'
               timeout-minutes: 20
               run: |
                   scripts/examples/mbed_example.sh -a=pigweed-app -b=$APP_TARGET -p=$APP_PROFILE
@@ -97,6 +111,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: Build all-clusters-app example
+              if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
               timeout-minutes: 20
               run: |
                   scripts/examples/mbed_example.sh -a=all-clusters-app -b=$APP_TARGET -p=$APP_PROFILE
@@ -106,6 +121,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: Build shell example
+              if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
               timeout-minutes: 20
               run: |
                   scripts/examples/mbed_example.sh -a=shell -b=$APP_TARGET -p=$APP_PROFILE
@@ -115,14 +131,15 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: Build ota-requestor-app example
+              if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
               timeout-minutes: 20
               run: |
                   scripts/examples/mbed_example.sh -a=ota-requestor-app -b=$APP_TARGET -p=$APP_PROFILE
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     mbed $APP_TARGET+$APP_PROFILE shell \
                     examples/ota-requestor-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-ota-requestor-app-example.elf \
                     /tmp/bloat_reports/
-
+            
             - name: Build unit tests
               # Temporarily disable build due to running out of flash space
               if: false

diff --git a/.github/workflows/smoketest-mbed.yaml b/.github/workflows/smoketest-mbed.yaml
diff --git a/examples/platform/mbed/util/include/DFUManager.h b/examples/platform/mbed/util/include/DFUManager.h
@@ -28,6 +28,7 @@
 
 #ifdef CHIP_OTA_REQUESTOR
 #include <BDXDownloader.h>
+#include <DefaultOTARequestorStorage.h>
 #include <OTAImageProcessorImpl.h>
 #include <OTARequestor.h>
 #include <OTARequestorDriverImpl.h>