From 598a4715e5714d50829256838a68ab37c81b4669 Mon Sep 17 00:00:00 2001 From: wangjingz Date: Thu, 21 Nov 2024 14:55:21 +0800 Subject: [PATCH 1/5] Create codeql.yml --- .github/workflows/codeql.yml | 98 ++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..230d4ef --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,98 @@ +# 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" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + paths-ignore: + - '**/*.md' + - '**/*.txt' + schedule: + - cron: '19 6 * * 1' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + runs-on: [ubuntu-latest] + # 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 + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + #include: + language: c-cpp + build-mode: manual + # 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 + - name: Check disk space + run: df -h + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # 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 + # 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 + - if: matrix.build-mode == 'manual' + shell: bash + run: | + sudo chmod a+x ./build_ivsr.sh + sudo ./build_ivsr.sh --enable_ov_patch false --enable_compile_ffmpeg false --ov_version 2023.2 + #environment variables setting + #source ./ivsr_setupvar.sh --ov_version 2023. + sudo df -h + echo ' build completed ！！！' + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From 5e47b699f9b3802e2a8231e47ba0dd1881fdb9ae Mon Sep 17 00:00:00 2001 From: wangjingz Date: Thu, 21 Nov 2024 14:57:20 +0800 Subject: [PATCH 2/5] Update codeql.yml --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 230d4ef..31ce767 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -47,8 +47,8 @@ jobs: fail-fast: false matrix: #include: - language: c-cpp - build-mode: manual + language: [c-cpp] + build-mode: [manual] # 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 From 92b75ebcbc3b7271d75d69f336bc4275172fe707 Mon Sep 17 00:00:00 2001 From: wangjingz Date: Mon, 2 Dec 2024 15:39:20 +0800 Subject: [PATCH 3/5] Update codeql.yml --- .github/workflows/codeql.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 31ce767..f1fb085 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,12 +20,16 @@ on: - '**/*.md' - '**/*.txt' schedule: - - cron: '19 6 * * 1' + - cron: '19 6 * * 0' + +permissions: + contents: read jobs: analyze: name: Analyze (${{ matrix.language }}) - runs-on: [ubuntu-latest] + runs-on: ${{ matrix.runner-os }} + # 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 @@ -33,20 +37,19 @@ jobs: # 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 - # required to fetch internal or private CodeQL packs packages: read - # only required for workflows in private repositories actions: read contents: read - + defaults: + run: + shell: bash strategy: fail-fast: false matrix: - #include: + runner-os: [ 'ubuntu-22.04' ] language: [c-cpp] build-mode: [manual] # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' @@ -62,7 +65,7 @@ jobs: uses: actions/checkout@v4 - name: Check disk space run: df -h - + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 @@ -82,11 +85,13 @@ jobs: # 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 - - if: matrix.build-mode == 'manual' - shell: bash + + # - if: matrix.build-mode == 'manual' + # shell: bash + - name: Build iVSR by Script run: | sudo chmod a+x ./build_ivsr.sh - sudo ./build_ivsr.sh --enable_ov_patch false --enable_compile_ffmpeg false --ov_version 2023.2 + sudo ./build_ivsr.sh --enable_ov_patch true --enable_compile_ffmpeg true --ov_version 2022.3 #environment variables setting #source ./ivsr_setupvar.sh --ov_version 2023. sudo df -h From 8a1bd74607bbc0d736489f737159b386a416acc2 Mon Sep 17 00:00:00 2001 From: wangjingz Date: Mon, 2 Dec 2024 16:24:36 +0800 Subject: [PATCH 4/5] Update codeql.yml --- .github/workflows/codeql.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f1fb085..43a4877 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -91,9 +91,7 @@ jobs: - name: Build iVSR by Script run: | sudo chmod a+x ./build_ivsr.sh - sudo ./build_ivsr.sh --enable_ov_patch true --enable_compile_ffmpeg true --ov_version 2022.3 - #environment variables setting - #source ./ivsr_setupvar.sh --ov_version 2023. + sudo ./build_ivsr.sh --enable_ov_patch true --enable_compile_ffmpeg true --ov_version 2023.2 sudo df -h echo ' build completed ！！！' From 63d81120ebff8b3563ebd32baee00b9297b542e4 Mon Sep 17 00:00:00 2001 From: wangjingz Date: Mon, 9 Dec 2024 14:32:25 +0800 Subject: [PATCH 5/5] Update codeql.yml update github action hash and update permissions. --- .github/workflows/codeql.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 43a4877..aaa714d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,7 +39,7 @@ jobs: permissions: security-events: write # required to fetch internal or private CodeQL packs - packages: read + # packages: read # only required for workflows in private repositories actions: read contents: read @@ -61,14 +61,22 @@ jobs: # 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: 'Harden Runner' + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 + with: + egress-policy: audit + - name: Checkout repository - uses: actions/checkout@v4 + #uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2 + - name: Check disk space run: df -h # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + #uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} @@ -91,11 +99,12 @@ jobs: - name: Build iVSR by Script run: | sudo chmod a+x ./build_ivsr.sh - sudo ./build_ivsr.sh --enable_ov_patch true --enable_compile_ffmpeg true --ov_version 2023.2 + sudo ./build_ivsr.sh --enable_ov_patch true --enable_compile_ffmpeg false --ov_version 2023.2 sudo df -h - echo ' build completed ！！！' + echo ' build ivsr_sample completed ！' - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + #uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: category: "/language:${{matrix.language}}"