Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-39806
This commit is contained in:
Andy Wilkinson
2024-02-29 20:58:01 +00:00
parent ba3602b8b7 34fe89981e
commit 6f7ae4d8ae
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
.github/workflows/windows-build.yml → .github/workflows/ci.yml vendored
View File

@@ -1,4 +1,4 @@
name: Windows Build name: CI
on: on:
push: push:
branches: branches:
@@ -6,20 +6,41 @@ on:
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
jobs: jobs:
build: ci:
name: 'Windows | Java 17'
runs-on: 'windows-latest'
if: ${{ github.repository == 'spring-projects/spring-boot' }} if: ${{ github.repository == 'spring-projects/spring-boot' }}
strategy:
matrix:
os:
- id: ubuntu-latest
name: Linux
- id: windows-latest
name: Windows
java:
- version: 17
toolchain: false
- version: 21
toolchain: true
exclude:
- os:
name: Linux
java:
version: 17
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
runs-on: ${{ matrix.os.id }}
steps: steps:
- name: Set up Java - name: Set up Java
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'liberica' distribution: 'liberica'
java-version: 17 java-version: |
- name: Configure git ${{ matrix.java.version }}
${{ matrix.java.toolchain && '17' || '' }}
- name: Prepare Windows runner
if: ${{ runner.os == 'Windows' }}
run: | run: |
git config --global core.autocrlf true git config --global core.autocrlf true
git config --global core.longPaths true git config --global core.longPaths true
Stop-Service -name Docker
- name: Check out code - name: Check out code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Set up Gradle - name: Set up Gradle
@@ -33,8 +54,15 @@ jobs:
echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
- name: Stop Docker service - name: Configure toolchain properties
run: Stop-Service -name Docker if: ${{ matrix.java.toolchain }}
shell: bash
run: |
echo toolchainVersion=${{ matrix.java.version }} >> $HOME/.gradle/gradle.properties
echo systemProp.org.gradle.java.installations.auto-detect=false >> $HOME/.gradle/gradle.properties
echo systemProp.org.gradle.java.installations.auto-download=false >> $HOME/.gradle/gradle.properties
echo systemProp.org.gradle.java.installations.paths=${{ format('$JAVA_HOME_{0}_X64', matrix.java.version) }} >> $HOME/.gradle/gradle.properties
cat $HOME/.gradle/gradle.properties
- name: Build - name: Build
id: build id: build
env: env:
@@ -44,9 +72,6 @@ jobs:
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
run: ./gradlew build run: ./gradlew build
- name: Print JVM thread dumps when cancelled
uses: ./.github/actions/print-jvm-thread-dumps
if: cancelled()
- name: Send notification - name: Send notification
uses: ./.github/actions/send-notification uses: ./.github/actions/send-notification
if: always() if: always()
@@ -54,4 +79,4 @@ jobs:
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
status: ${{ job.status }} status: ${{ job.status }}
build-scan-url: ${{ steps.build.outputs.build-scan-url }} build-scan-url: ${{ steps.build.outputs.build-scan-url }}
run-name: ${{ format('{0} | Windows | Java 17', github.ref_name) }} run-name: ${{ format('{0} | ${{ matrix.os.name }} | Java ${{ matrix.java.version}}', github.ref_name) }}