Skip to content

Commit cf458c3

Browse files
committed
Merge branch 'master' into major/3.0
2 parents b5f4b74 + ae73d8c commit cf458c3

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎.github/workflows/test-integrations-tasks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
enable-cache: false
4343
- name: Install Java
44-
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6
44+
uses: actions/setup-java@d1374f8ac74474200d16ef8ecee22c7ae7a51880 # v6
4545
with:
4646
distribution: 'temurin'
4747
java-version: '21'

‎renovate.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
"matchDatasources": ["github-runners"],
2626
"enabled": false
2727
},
28+
{
29+
"description": "Disable Java version updates in setup-java.",
30+
"matchManagers": ["github-actions"],
31+
"matchDatasources": ["java-version"],
32+
"enabled": false
33+
},
2834
{
2935
"description": "Group GitHub workflow updates.",
3036
"matchManagers": ["custom.regex", "github-actions"],

‎scripts/split_tox_gh_actions/templates/test_group.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
{% if needs_java %}
8787
- name: Install Java
88-
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6
88+
uses: actions/setup-java@d1374f8ac74474200d16ef8ecee22c7ae7a51880 # v6
8989
with:
9090
distribution: 'temurin'
9191
java-version: '21'

0 commit comments

Comments
 (0)