From 136272ee2bf87067e7c938021f013f49434fdf22 Mon Sep 17 00:00:00 2001 From: Matts966 Date: Fri, 14 Aug 2026 08:00:23 +0900 Subject: [PATCH 1/2] Fix and update CodeQL versions (#3600) Co-authored-by: Yusuke Kato --- .github/actions/scan-docker-image/action.yaml | 4 ++++ .github/workflows/codeql-analysis.yml | 10 ++++++++++ versions/actions/GITHUB_CODEQL_ACTION_ANALYZE | 4 ++++ versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD | 4 ++++ versions/actions/GITHUB_CODEQL_ACTION_INIT | 4 ++++ versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF | 4 ++++ 6 files changed, 30 insertions(+) diff --git a/.github/actions/scan-docker-image/action.yaml b/.github/actions/scan-docker-image/action.yaml index 0661a898ef..606e98d905 100644 --- a/.github/actions/scan-docker-image/action.yaml +++ b/.github/actions/scan-docker-image/action.yaml @@ -45,6 +45,10 @@ runs: severity: ${{ inputs.severity }} timeout: 30m - name: Upload Trivy scan results to Security tab +<<<<<<< HEAD uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1 +======= + uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) with: sarif_file: "trivy-results.sarif" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 22a3199421..eed8054380 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -90,15 +90,25 @@ jobs: run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: Initialize CodeQL +<<<<<<< HEAD uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1 +======= + uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} config-file: ./.github/codeql/codeql-config.yaml - name: Autobuild if: matrix.language == 'go' +<<<<<<< HEAD uses: github/codeql-action/autobuild@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1 - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1 +======= + uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) with: category: "/language:${{matrix.language}}" diff --git a/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE b/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE index 516b3249d9..079d213989 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE +++ b/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE @@ -1 +1,5 @@ +<<<<<<< HEAD 4.34.1 +======= +4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD b/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD index 516b3249d9..079d213989 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD +++ b/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD @@ -1 +1,5 @@ +<<<<<<< HEAD 4.34.1 +======= +4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_INIT b/versions/actions/GITHUB_CODEQL_ACTION_INIT index 516b3249d9..079d213989 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_INIT +++ b/versions/actions/GITHUB_CODEQL_ACTION_INIT @@ -1 +1,5 @@ +<<<<<<< HEAD 4.34.1 +======= +4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF b/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF index d5663ffbea..dc1f95ea8e 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF +++ b/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF @@ -1 +1,5 @@ +<<<<<<< HEAD 4.35.1 +======= +4.37.6 +>>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) From 061a74e1b0d856d897ce1036d418d84742e8d8be Mon Sep 17 00:00:00 2001 From: datelier <57349093+datelier@users.noreply.github.com> Date: Wed, 26 Aug 2026 08:46:21 +0900 Subject: [PATCH 2/2] fix conflict --- .github/actions/scan-docker-image/action.yaml | 4 ---- .github/workflows/codeql-analysis.yml | 10 ---------- versions/actions/GITHUB_CODEQL_ACTION_ANALYZE | 4 ---- versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD | 4 ---- versions/actions/GITHUB_CODEQL_ACTION_INIT | 4 ---- versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF | 4 ---- 6 files changed, 30 deletions(-) diff --git a/.github/actions/scan-docker-image/action.yaml b/.github/actions/scan-docker-image/action.yaml index 606e98d905..dce2c4f5fb 100644 --- a/.github/actions/scan-docker-image/action.yaml +++ b/.github/actions/scan-docker-image/action.yaml @@ -45,10 +45,6 @@ runs: severity: ${{ inputs.severity }} timeout: 30m - name: Upload Trivy scan results to Security tab -<<<<<<< HEAD - uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1 -======= uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) with: sarif_file: "trivy-results.sarif" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index eed8054380..b144aa36ca 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -90,25 +90,15 @@ jobs: run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: Initialize CodeQL -<<<<<<< HEAD - uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1 -======= uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} config-file: ./.github/codeql/codeql-config.yaml - name: Autobuild if: matrix.language == 'go' -<<<<<<< HEAD - uses: github/codeql-action/autobuild@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1 -======= uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) with: category: "/language:${{matrix.language}}" diff --git a/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE b/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE index 079d213989..aa12a5639a 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE +++ b/versions/actions/GITHUB_CODEQL_ACTION_ANALYZE @@ -1,5 +1 @@ -<<<<<<< HEAD -4.34.1 -======= 4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD b/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD index 079d213989..aa12a5639a 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD +++ b/versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD @@ -1,5 +1 @@ -<<<<<<< HEAD -4.34.1 -======= 4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_INIT b/versions/actions/GITHUB_CODEQL_ACTION_INIT index 079d213989..aa12a5639a 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_INIT +++ b/versions/actions/GITHUB_CODEQL_ACTION_INIT @@ -1,5 +1 @@ -<<<<<<< HEAD -4.34.1 -======= 4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600)) diff --git a/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF b/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF index dc1f95ea8e..aa12a5639a 100644 --- a/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF +++ b/versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF @@ -1,5 +1 @@ -<<<<<<< HEAD -4.35.1 -======= 4.37.6 ->>>>>>> 959470a15 (Fix and update CodeQL versions (#3600))