Skip to content

Commit

Permalink
Fix install scripts to handle main python requirements, update CodeQL…
Browse files Browse the repository at this point in the history
… to use it
  • Loading branch information
mikee47 committed Feb 10, 2021
1 parent f28c4d6 commit 84a4467
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
18 changes: 6 additions & 12 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

strategy:
fail-fast: false
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Tools/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 84a4467

Please sign in to comment.