From dfa3ffd6ffcb22845fb917d4057dfce8249e7349 Mon Sep 17 00:00:00 2001
From: "Li, Xun" <xun.li@intel.com>
Date: Thu, 20 Jun 2024 13:10:54 +0800
Subject: [PATCH] fixup! Update codeql.yml

Signed-off-by: Li, Xun <xun.li@intel.com>
---
 .github/codeql/codeql-config.yml |  6 +++++
 .github/workflows/c-cpp.yml      |  2 +-
 .github/workflows/codeql.yml     | 45 +-------------------------------
 3 files changed, 8 insertions(+), 45 deletions(-)
 create mode 100644 .github/codeql/codeql-config.yml

diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 00000000..ee3e1a29
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,6 @@
+name: "CodeQL config"
+paths-ignore:
+  - external
+  - QuoteVerification/QuoteVerificationService
+  - QuoteVerification/QVL
+  - QuoteVerification/sgxssl
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index ff530a86..9b2dbb93 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: install libboost
+    - name: install dependencies
       run: sudo apt-get install libcurl4-openssl-dev libboost-dev libboost-system-dev libboost-thread-dev
     - name: init submodule
       run: git submodule update --init --recursive
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6fa3a1ff..0e32673e 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,14 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
@@ -22,11 +11,6 @@ on:
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
     runs-on: ubuntu-22.04
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
@@ -39,15 +23,7 @@ jobs:
         include:
         - language: c-cpp
           build-mode: manual
-          sarif-name: cpp
         # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
-        # Use `c-cpp` to analyze code written in C, C++ or both
-        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -60,13 +36,11 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
+        config-file: ./.github/codeql/codeql-config.yml
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
 
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
     # If the analyze step fails for one of the languages you are analyzing with
     # "We were unable to automatically build your code", modify the matrix above
     # to set the build mode to "manual" for that language. Then modify this step
@@ -87,21 +61,4 @@ jobs:
       uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
-        output: sarif-results
-        upload: failure-only
-
-    - name: Filter SARIF
-      uses: advanced-security/filter-sarif@v1
-      with:
-        patterns: |
-          -external
-          -QuoteVerification/QuoteVerificationService
-          -QuoteVerification/QVL
-          -QuoteVerification/sgxssl
-        input: sarif-results/${{ matrix.sarif-name }}.sarif
-        output: sarif-results/${{ matrix.sarif-name }}.sarif
 
-    - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v3
-      with:
-        sarif_file: sarif-results/${{ matrix.sarif-name }}.sarif