Make ZAP generation check do a clean of java folders first (#30956)

* Clean java before zap check * Remove obsolete file * One more file removed --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Feb 1, 2024 · 2800027 · 2800027
1 parent bde7736
commit 2800027
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 560 deletions.
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -51,6 +51,11 @@ jobs:
               run: |
                 apt-get update
                 DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing openjdk-17-jre
+            # Clean out java generated files: since java codegen will generate one file per
+            # structure/cluster, if clusters and structures are ever changed (for in progress work)
+            # this may leave obsolete files. Ensure we always check for clean regen.
+            - name: Ensure clean java
+              run: rm -rf src/controller/java/generated/
             - name: Generate all
               run: ./scripts/run_in_build_env.sh scripts/tools/zap_regen_all.py
             - name: Generate script-maintained items (ERROR_CODES.md)

diff --git a/...va/chip/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt b/...va/chip/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt