From 252417388b319a88f654bfa8f80d39a5f68ecdea Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Tue, 6 Oct 2020 16:42:01 -0700
Subject: [PATCH] Updating

---
 .github/workflows/build.yaml      |  2 +-
 .github/workflows/examples-gn.yml |  2 +-
 .github/workflows/examples.yaml   | 29 ++++++++++++++---------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a8e38d87b77d6a..b74b983375a1f6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -49,7 +49,7 @@ jobs:
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v1
               with:
-                  languages: "cpp"
+                  languages: "cpp, python"
                   queries: +security-and-quality
 
             - name: Bootstrap
diff --git a/.github/workflows/examples-gn.yml b/.github/workflows/examples-gn.yml
index fe8e36ea36c3ea..b03e382d514481 100644
--- a/.github/workflows/examples-gn.yml
+++ b/.github/workflows/examples-gn.yml
@@ -43,7 +43,7 @@ jobs:
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v1
               with:
-                  languages: "cpp"
+                  languages: "cpp, python"
                   queries: +security-and-quality
             - name: Build example Echo App
               run: scripts/examples/esp_echo_app.sh CHIP_BUILD_WITH_GN=y
diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml
index 2ddea9bf3375b7..1f0cd3abdf732d 100644
--- a/.github/workflows/examples.yaml
+++ b/.github/workflows/examples.yaml
@@ -46,7 +46,7 @@ jobs:
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v1
               with:
-                  languages: "cpp"
+                  languages: "cpp, python"
                   queries: +security-and-quality
             - name: Bootstrap
               run: scripts/build/gn_bootstrap.sh
@@ -75,10 +75,10 @@ jobs:
                       out/lock_app_debug/chip-nrf52840-lock-example
                       out/lighting_app_debug/chip-nrf52840-lighting-example
             # TODO: NRF Connect https://github.com/project-chip/connectedhomeip/issues/2225
-            - name: Remove third_party binaries for CodeQL Analysis
-              run: find . -type d -name "third_party" -exec rm -rf {} +
-            - name: Remove nrfxlib binaries for CodeQL Analysis
-              run: find . -type d -name "nrfxlib" -exec rm -rf {} +
+            # - name: Remove third_party binaries for CodeQL Analysis
+            #   run: find . -type d -name "third_party" -exec rm -rf {} +
+            # - name: Remove nrfxlib binaries for CodeQL Analysis
+            #   run: find . -type d -name "nrfxlib" -exec rm -rf {} +
             - name: Perform CodeQL Analysis
               if: ${{ github.event_name == 'push' }}
               uses: github/codeql-action/analyze@v1
@@ -109,7 +109,7 @@ jobs:
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v1
               with:
-                  languages: "cpp"
+                  languages: "cpp, python"
                   queries: +security-and-quality
             - name: Bootstrap
               run: scripts/build/gn_bootstrap.sh
@@ -137,10 +137,10 @@ jobs:
                   path: |
                       out/chip_tool_debug/chip-tool
                       out/shell_debug/chip-shell
-            - name: Remove third_party binaries for CodeQL Analysis
-              run: find . -type d -name "third_party" -exec rm -rf {} +
-            - name: Remove dbus binaries for CodeQL Analysis
-              run: find . -type d -name "dbus" -exec rm -rf {} +
+            # - name: Remove third_party binaries for CodeQL Analysis
+            #   run: find . -type d -name "third_party" -exec rm -rf {} +
+            # - name: Remove dbus binaries for CodeQL Analysis
+            #   run: find . -type d -name "dbus" -exec rm -rf {} +
             - name: Perform CodeQL Analysis
               if: ${{ github.event_name == 'push' }}
               uses: github/codeql-action/analyze@v1
@@ -168,7 +168,7 @@ jobs:
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v1
               with:
-                  languages: "cpp"
+                  languages: "cpp, python"
                   queries: +security-and-quality
             - name: Build example EFR32 Lock App for BRD4161A
               run:
@@ -194,9 +194,8 @@ jobs:
                   path: |
                       out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out
                       out/lighting_app_debug/BRD4161A/chip-efr32-lighting-example.out
-            - name: Remove third_party binaries for CodeQL Analysis
-              run: find . -type d -name "third_party" -exec rm -rf {} +
-            - name: Remove dbus binaries for CodeQL Analysis
+            # - name: Remove third_party binaries for CodeQL Analysis
+            #   run: find . -type d -name "third_party" -exec rm -rf {} +
             - name: Perform CodeQL Analysis
               if: ${{ github.event_name == 'push' }}
               uses: github/codeql-action/analyze@v1
@@ -224,7 +223,7 @@ jobs:
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v1
               with:
-                  languages: "cpp"
+                  languages: "cpp, python"
                   queries: +security-and-quality
             - name: Build example nRF Connect SDK Lock App
               run: scripts/examples/nrfconnect_example.sh lock-app