Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ jobs:
scanners: vuln
cache: false
- name: Upload Trivy report to GitHub Security
uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
uses: github/codeql-action/upload-sarif@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
# upload even if a preceding step failed, but not without a report to upload
if: ${{ always() && hashFiles('trivy-results.sarif') != '' }}
with:
Expand Down
24 changes: 16 additions & 8 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,22 @@ jobs:
with:
submodules: recursive

# With build-mode 'none' CodeQL infers no JDK from this project and
# models the JDK API on the java found on the PATH, so without this step
# the results follow the default JDK of the runner image: ubuntu-26.04
# brought JDK 25 and with it alerts for APIs deprecated only after
# Java 11. Pin the JDK and distribution the release is built with
# (release.yml): 8 on sustaining/4.10.x, 11 otherwise. It also serves
# the Java manual build below.
- name: Set up JDK
if: matrix.language == 'java-kotlin'
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
with:
java-version: ${{ (github.base_ref || github.ref_name) == 'sustaining/4.10.x' && '8' || '11' }}
distribution: 'temurin'

- name: Initialize CodeQL
uses: github/codeql-action/init@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
Expand Down Expand Up @@ -118,12 +132,6 @@ jobs:
# ---------------------------------------------------------------------

# --- Java manual build (only used if the java entry is set to 'manual')
# - name: Set up JDK 11
# if: matrix.language == 'java-kotlin'
# uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
# with:
# java-version: '11'
# distribution: 'zulu'
# - name: Cache Maven packages
# if: matrix.language == 'java-kotlin'
# uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
Expand All @@ -139,6 +147,6 @@ jobs:
# ---------------------------------------------------------------------

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
uses: github/codeql-action/analyze@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
with:
category: "/language:${{ matrix.language }}"
2 changes: 1 addition & 1 deletion .github/workflows/docker-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
scanners: vuln
cache: false
- name: Upload report to GitHub Security
uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
uses: github/codeql-action/upload-sarif@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
# upload even if a preceding step failed, but not without a report to upload
if: ${{ always() && hashFiles(format('trivy-{0}.sarif', matrix.tag)) != '' }}
with:
Expand Down
Loading