diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0af11fbb07..b06245fb1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup JDK 21 - if: contains('main 3.6.x', github.base_ref) + if: contains('main 3.6.x 3.7.x', github.base_ref) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' @@ -75,7 +75,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup Java 21 - if: contains('main 3.6.x', github.base_ref) + if: contains('main 3.6.x 3.7.x', github.base_ref) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index d61021f962..964d2e142c 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [ 3.6.x, main ] + branch: [ 3.6.x, 3.7.x, main ] test-type: - type: core arguments: ":reactor-core:test --no-daemon" @@ -43,7 +43,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup Java 21 - if: contains('main 3.6.x', matrix.branch) + if: contains('main 3.6.x 3.7.x', matrix.branch) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f4543143fc..e7577a0d2b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,7 +41,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup JDK 21 - if: contains('main 3.6.x', github.base_ref) + if: contains('main 3.6.x 3.7.x', github.base_ref) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' @@ -108,7 +108,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup JDK 21 - if: contains('main 3.6.x', github.base_ref) + if: contains('main 3.6.x 3.7.x', github.base_ref) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' @@ -146,7 +146,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup JDK 21 - if: contains('main 3.6.x', github.base_ref) + if: contains('main 3.6.x 3.7.x', github.base_ref) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' @@ -186,7 +186,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup JDK 21 - if: contains('main 3.6.x', github.base_ref) + if: contains('main 3.6.x 3.7.x', github.base_ref) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index acf9e05b1f..e05e3514d7 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [ 3.6.x, main ] + branch: [ 3.6.x, 3.7.x, main ] test-type: - type: core arguments: ":reactor-core:test --no-daemon -DuseSnapshotMicrometerVersion=true" @@ -41,7 +41,7 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup Java 21 - if: contains('main 3.6.x', matrix.branch) + if: contains('main 3.6.x 3.7.x', matrix.branch) uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3 with: distribution: 'temurin' diff --git a/build.gradle b/build.gradle index f45ee0e945..eb09d47b12 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,7 @@ spotless { enforceCheck false } else { - String spotlessBranch = "origin/main" + String spotlessBranch = "origin/3.7.x" println "[Spotless] Local run detected, ratchet from $spotlessBranch" ratchetFrom spotlessBranch }