From fd0b4a8dca512e9d6e281353a659c84cae57f51c Mon Sep 17 00:00:00 2001
From: Brian <bayuan@purdue.edu>
Date: Wed, 29 Nov 2023 16:21:29 -0500
Subject: [PATCH] add: build script integration into codeql.yml

---
 .github/workflows/codeql-buildscript.sh | 18 ------------------
 .github/workflows/codeql.yml            | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100755 .github/workflows/codeql-buildscript.sh

diff --git a/.github/workflows/codeql-buildscript.sh b/.github/workflows/codeql-buildscript.sh
deleted file mode 100755
index bada8d93bf..0000000000
--- a/.github/workflows/codeql-buildscript.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-sudo apt-get install -y python3-venv python3-pip
-npm install lv_font_conv
-
-wget --no-verbose 'https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip'
-unzip -q nRF5_SDK_15.3.0_59ac345
-
-python3 -m venv .venv
-source .venv/bin/activate
-python3 -m pip install wheel
-python3 -m pip install -r tools/mcuboot/requirements.txt
-
-cmake -Bbuild -DNRF5_SDK_PATH=$(realpath nRF5_SDK_15.3.0_59ac345) \
-  -DARM_NONE_EABI_TOOLCHAIN_PATH=$(dirname $(dirname $(realpath $(which arm-none-eabi-gcc))))
-cmake --build build -t pinetime-app
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 56454f22f1..cb198c23c4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -80,7 +80,22 @@ jobs:
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     - run: |
-        ./.github/workflows/codeql-buildscript.sh
+        set -e
+
+        sudo apt-get install -y python3-venv python3-pip
+        npm install lv_font_conv
+
+        wget --no-verbose 'https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip'
+        unzip -q nRF5_SDK_15.3.0_59ac345
+
+        python3 -m venv .venv
+        source .venv/bin/activate
+        python3 -m pip install wheel
+        python3 -m pip install -r tools/mcuboot/requirements.txt
+
+        cmake -Bbuild -DNRF5_SDK_PATH=$(realpath nRF5_SDK_15.3.0_59ac345) \
+          -DARM_NONE_EABI_TOOLCHAIN_PATH=$(dirname $(dirname $(realpath $(which arm-none-eabi-gcc))))
+        cmake --build build -t pinetime-app
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
@@ -124,4 +139,4 @@ jobs:
       with:
         name: codeql-results
         path: ${{ steps.step1.outputs.sarif-output }}
-        retention-days: 5
\ No newline at end of file
+        retention-days: 5