From c2f63de9a396b091006b0942fb8e486196d579b6 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 28 Aug 2026 05:27:19 -0700 Subject: [PATCH 1/3] fix:codeql scan --- .github/codeql/codeql-full-config.yml | 3 + .github/scripts/codeql-matrix.sh | 32 ++++++ .github/workflows/codeql-full.yml | 69 +++++++++++++ .github/workflows/codeql.yml | 136 ++++++++++---------------- 4 files changed, 154 insertions(+), 86 deletions(-) create mode 100644 .github/codeql/codeql-full-config.yml create mode 100644 .github/scripts/codeql-matrix.sh create mode 100644 .github/workflows/codeql-full.yml diff --git a/.github/codeql/codeql-full-config.yml b/.github/codeql/codeql-full-config.yml new file mode 100644 index 00000000..3c863a3a --- /dev/null +++ b/.github/codeql/codeql-full-config.yml @@ -0,0 +1,3 @@ +# Full CodeQL scan config. +paths-ignore: + - '**/target/' diff --git a/.github/scripts/codeql-matrix.sh b/.github/scripts/codeql-matrix.sh new file mode 100644 index 00000000..8ed26028 --- /dev/null +++ b/.github/scripts/codeql-matrix.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +set -euo pipefail + +matrix_entries="" + +has_files() { + git ls-files "$@" | grep -q . +} + +add_entry() { + local entry="$1" + if [ -n "$matrix_entries" ]; then + matrix_entries="$matrix_entries,$entry" + else + matrix_entries="$entry" + fi +} + +if has_files '.github/workflows/*.yml' '.github/workflows/*.yaml'; then + add_entry '{"language":"actions","build-mode":"none"}' +fi + +if has_files '*.java'; then + add_entry '{"language":"java-kotlin","build-mode":"autobuild"}' +fi + +if has_files '*.js' '*.jsx' '*.ts' '*.tsx' '*.mjs' '*.cjs' '*.vue' '*.html'; then + add_entry '{"language":"javascript-typescript","build-mode":"none"}' +fi + +printf '{"include":[%s]}\n' "$matrix_entries" diff --git a/.github/workflows/codeql-full.yml b/.github/workflows/codeql-full.yml new file mode 100644 index 00000000..6bc7626d --- /dev/null +++ b/.github/workflows/codeql-full.yml @@ -0,0 +1,69 @@ +name: CodeQL Full Scan + +on: + schedule: + - cron: '24 15 * * 1' + workflow_dispatch: + +permissions: + contents: read + security-events: write + packages: read + actions: read + +jobs: + detect: + name: Detect CodeQL languages + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.matrix.outputs.matrix }} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Build matrix + id: matrix + shell: bash + run: | + matrix=$(bash .github/scripts/codeql-matrix.sh) + printf 'matrix=%s\n' "$matrix" >> "$GITHUB_OUTPUT" + + analyze: + needs: detect + name: Full scan (${{ matrix.language }}) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: ${{ fromJSON(needs.detect.outputs.matrix) }} + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up JDK 17 + if: matrix.language == 'java-kotlin' + uses: actions/setup-java@v5 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + + - name: Initialize CodeQL + uses: github/codeql-action/init@v4 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + config-file: ./.github/codeql/codeql-full-config.yml + + - name: Build project + if: matrix.language == 'java-kotlin' + run: mvn -B clean test-compile -DskipTests -Dcheckstyle.skip=true -Dpmd.skip=true -Dspotbugs.skip=true -Dcpd.skip=true + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v4 + with: + category: "/codeql-full:${{ matrix.language }}" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1a5d4ced..dd413432 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,102 +1,66 @@ -# 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 Advanced" +name: CodeQL Incremental on: push: branches: [ "develop" ] pull_request: branches: [ "develop" ] - schedule: - - cron: '24 15 * * 1' -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: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - permissions: - # required for all workflows - security-events: write +permissions: + contents: read + security-events: write + packages: read + actions: read - # required to fetch internal or private CodeQL packs - packages: read +jobs: + detect: + name: Detect CodeQL languages + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.matrix.outputs.matrix }} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 - # only required for workflows in private repositories - actions: read - contents: read + - name: Build matrix + id: matrix + shell: bash + run: | + matrix=$(bash .github/scripts/codeql-matrix.sh) + printf 'matrix=%s\n' "$matrix" >> "$GITHUB_OUTPUT" + analyze: + needs: detect + name: Analyze (${{ matrix.language }}) + runs-on: ubuntu-latest strategy: fail-fast: false - matrix: - include: - - language: actions - build-mode: none - - language: java-kotlin - build-mode: autobuild # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. - # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', '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 + matrix: ${{ fromJSON(needs.detect.outputs.matrix) }} - # Add any setup steps before running the `github/codeql-action/init` action. - # This includes steps like installing compilers or runtimes (`actions/setup-node` - # or others). This is typically only required for manual builds. - # - name: Setup runtime (example) - # uses: actions/setup-example@v1 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v4 - 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. + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 - # 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 + - name: Set up JDK 17 + if: matrix.language == 'java-kotlin' + uses: actions/setup-java@v5 + with: + java-version: '17' + distribution: 'temurin' + cache: maven - # 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 - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - name: Run manual build steps - if: matrix.build-mode == 'manual' - shell: bash - run: | - echo 'If you are using a "manual" build mode for one or more of the' \ - 'languages you are analyzing, replace this with the commands to build' \ - 'your code, for example:' - echo ' make bootstrap' - echo ' make release' - exit 1 + - name: Initialize CodeQL + uses: github/codeql-action/init@v4 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + config-file: ./.github/codeql/codeql-config.yml - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 - with: - category: "/language:${{matrix.language}}" + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v4 + with: + category: "/codeql-incremental:${{ matrix.language }}" From 2a05919698f44e715866196c77dd7b2c8bbb5d2e Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 28 Aug 2026 05:36:02 -0700 Subject: [PATCH 2/3] fix:codeql scan --- .github/workflows/codeql-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-full.yml b/.github/workflows/codeql-full.yml index 6bc7626d..c4fb1a42 100644 --- a/.github/workflows/codeql-full.yml +++ b/.github/workflows/codeql-full.yml @@ -2,7 +2,7 @@ name: CodeQL Full Scan on: schedule: - - cron: '24 15 * * 1' + - cron: '35 3 * * 6' workflow_dispatch: permissions: From 17460573d00cab2b8454f1fdf3bb079c36335ed9 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 28 Aug 2026 05:41:07 -0700 Subject: [PATCH 3/3] fix:codeql scan --- .github/workflows/codeql-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-full.yml b/.github/workflows/codeql-full.yml index c4fb1a42..09ce4487 100644 --- a/.github/workflows/codeql-full.yml +++ b/.github/workflows/codeql-full.yml @@ -2,7 +2,7 @@ name: CodeQL Full Scan on: schedule: - - cron: '35 3 * * 6' + - cron: '42 12 * * 5' workflow_dispatch: permissions: