From 65727964932c3be55662ea182a9da1d854aea39e Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andrei@andy314.com>
Date: Wed, 8 Dec 2021 16:19:47 -0500
Subject: [PATCH] Fix flashbundle error in infineon. Ensure CI will catch this
 in the future (#12744)

---
 .github/workflows/examples-infineon.yaml | 21 ++++++++++++++++++---
 scripts/build/builders/infineon.py       |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index de651be3d54ad9..ec6188e77c222a 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -61,7 +61,12 @@ jobs:
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-lock' build"
+                  "scripts/build/build_examples.py \
+                      --enable-flashbundle --no-log-timestamps \
+                      --target infineon-p6-lock \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default lock-app \
                     out/infineon-p6-lock/chip-p6-lock-example.out
@@ -69,7 +74,12 @@ jobs:
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-all-clusters' build"
+                  "scripts/build/build_examples.py \
+                      --enable-flashbundle --no-log-timestamps \
+                      --target infineon-p6-all-clusters \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default all-clusters-app \
                     out/infineon-p6-all-clusters/chip-p6-clusters-example.out
@@ -77,7 +87,12 @@ jobs:
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-light' build"
+                  "scripts/build/build_examples.py \
+                      --enable-flashbundle --no-log-timestamps \
+                      --target infineon-p6-light \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default light-app \
                     out/infineon-p6-light/chip-p6-lighting-example.out
diff --git a/scripts/build/builders/infineon.py b/scripts/build/builders/infineon.py
index 3c5f1f828afa37..3324525c6ae3a6 100644
--- a/scripts/build/builders/infineon.py
+++ b/scripts/build/builders/infineon.py
@@ -49,7 +49,7 @@ def FlashBundleName(self):
         elif self == InfineonApp.ALL_CLUSTERS:
             return 'clusters_app.flashbundle.txt'
         elif self == InfineonApp.LIGHT:
-            return 'light_app.flashbundle.txt'
+            return 'lighting_app.flashbundle.txt'
         else:
             raise Exception('Unknown app type: %r' % self)