Merge branch 'main' into dependabot/github_actions/github-actions-e9dd73a904

This commit is contained in:
Daz DeBoer
2024-12-11 10:17:04 -07:00
committed by GitHub
17 changed files with 46 additions and 19 deletions

View File

@@ -29,7 +29,7 @@ jobs:
env:
ALLOWED_GRADLE_WRAPPER_CHECKSUMS: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # Invalid wrapper jar used for testing
with:
gradle-version: "8.11"
gradle-version: "8.11.1"
- name: Check formatting and compile
run: |

View File

@@ -0,0 +1,23 @@
name: Combine Bot PRs
on:
workflow_dispatch:
# The minimum permissions required to run this Action
permissions:
contents: write
pull-requests: write
checks: read
jobs:
combine-wrapperbot-prs:
if: github.repository == 'gradle/actions'
runs-on: ubuntu-latest
steps:
- name: combine-wrapperbot-prs
uses: github/combine-prs@v5.2.0
with:
branch_prefix: wrapperbot
pr_title: 'Bump Gradle Wrappers'
ci_required: "false"
github_token: ${{ secrets.BOT_GITHUB_TOKEN }}

View File

@@ -78,7 +78,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gradle: ["8.11", 8.9, 8.1, 7.6.4, 6.9.4, 5.6.4, 4.10.3, 3.5.1]
gradle: ["8.11.1", 8.9, 8.1, 7.6.4, 6.9.4, 5.6.4, 4.10.3, 3.5.1]
os: ${{fromJSON(inputs.runner-os)}}
include:
- java-version: 11