Update ZAP submodule and remove tracking of master in CI

project-chip · Nov 19, 2020 · 8bec229 · 8bec229
1 parent 84acadf
commit 8bec229
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -43,8 +43,6 @@ jobs:
             - name: Setup ZAP
               run: |
                 cd third_party/zap/repo/
-                git checkout master
-                git pull
                 npm ci
                 npm run version-stamp
                 npm rebuild canvas --update-binary

diff --git a/third_party/zap/repo b/third_party/zap/repo
+5 −3		docs/custom-zcl.md
+1 −2		package-lock.json
+3 −3		package.json
+21 −0		src-electron/db/db-mapping.js
+143 −0		src-electron/db/query-package.js
+29 −21		src-electron/db/query-zcl.js
+87 −10		src-electron/generator/generation-engine.js
+15 −2		src-electron/generator/helper-c.js
+115 −0		src-electron/generator/helper-sdkextension.js
+48 −18		src-electron/generator/helper-zcl.js
+1 −0		src-electron/generator/template-engine.js
+50 −37		src-electron/main-process/electron-main.js
+6 −5		src-electron/main-process/startup.js
+14 −0		src-electron/util/string.js
+2 −2		src-electron/zcl/zcl-loader-silabs.js
+1 −1		src-script/zap-generate.js
+7 −0		src-shared/db-enum.js
+1 −1		test/endpoint-config.test.js
+35 −1		test/gen-template/zigbee/gen-templates.json
+22 −0		test/gen-template/zigbee/sdk-extension.zapt
+26 −1		test/genengine.test.js
+71 −10		test/generation.test.js
+6 −0		test/string.test.js
+8 −0		test/zcl-loader.test.js