From 84a4467c77c74bc24342d05e6d20343f2cd57d2b Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sat, 6 Feb 2021 21:14:02 +0000
Subject: [PATCH] Fix install scripts to handle main python requirements,
 update CodeQL to use it

---
 .github/workflows/codeql-analysis.yml | 18 ++++++------------
 Tools/install.sh                      |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 634f26726d..da50404adc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
@@ -61,16 +61,10 @@ jobs:
     - if: matrix.language == 'cpp' || matrix.language == 'c'
       name: Build Sming C/C++
       run: |
-       sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-       sudo apt-get update -y
-       sudo apt-get install gcc-9-multilib g++-9-multilib python3-wheel python3-setuptools
-       sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
-       python3 -m pip install --upgrade pip wheel -r Tools/requirements.txt
-       env
-       cd Sming
-       export SMING_HOME=$(pwd)
-       cd ../samples/Basic_Blink
-       make -j3 SMING_ARCH=Host
-       
+        sudo Tools/install.sh host
+        . Tools/export.sh
+        cd samples/Basic_Blink
+        make -j3 SMING_ARCH=Host
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/Tools/install.sh b/Tools/install.sh
index 866bd61d45..93f4f4b96e 100755
--- a/Tools/install.sh
+++ b/Tools/install.sh
@@ -74,7 +74,7 @@ fi
 
 # Common install
 
-if [ -n "$APPVEYOR" ]; then
+if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then
 
     sudo apt-get -y update
     $PKG_INSTALL \