Skip to content

Commit 54eb545

Browse files
committed
Merge remote-tracking branch 'upstream/main' into update-ossf-workflow-permissions
2 parents 5419cbc + 62eb7f3 commit 54eb545

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/renovate.json5

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@
173173
},
174174
{
175175
// intentionally using Java 11 in some examples
176-
// not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre"
177176
"matchPackageNames": ["eclipse-temurin"],
177+
"matchUpdateTypes": ["major"],
178178
"enabled": false
179179
},
180180
{

.github/workflows/codeql.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ jobs:
6161
tools: latest
6262

6363
- name: Build
64-
# skipping build cache is needed so that all modules will be analyzed
65-
run: ./gradlew assemble -x javadoc
64+
# --no-build-cache is required for codeql to analyze all modules
65+
# --no-daemon is required for codeql to observe the compilation
66+
# (see https://docs.github.com/en/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#specifying-build-commands)
67+
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
6668

6769
- name: Perform CodeQL analysis
6870
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

0 commit comments

Comments
 (0)