Skip to content

Commit

Permalink
Merge build dependency bumps into 3.6.0-M2
Browse files Browse the repository at this point in the history
  • Loading branch information
chemicL committed Aug 7, 2023
2 parents bcc8c8a + 5e66d9a commit 448c976
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
name: spotless (license header)
if: always()
with:
arguments: spotlessCheck -PspotlessFrom=origin/${{ github.base_ref }}
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
name: api compatibility
if: always()
with:
Expand Down Expand Up @@ -69,23 +69,23 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
name: gradle
with:
arguments: :reactor-core:test --no-daemon -Pjunit-tags=!slow
Expand All @@ -102,19 +102,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -134,23 +134,23 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
name: gradle
with:
arguments: :reactor-core:test --no-daemon -Pjunit-tags=slow
Expand All @@ -166,23 +166,23 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
name: other tests
with:
arguments: check -x :reactor-core:test -x :reactor-core:java9Test -x :reactor-core:java21Test -x spotlessCheck --no-daemon
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # tag=v1
- uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # tag=v1
34 changes: 17 additions & 17 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -49,7 +49,7 @@ jobs:
run: ./gradlew qualifyVersionGha
- name: run checks
id: checks
uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
with:
arguments: check -Pjunit-tags=!slow -x jcstress

Expand All @@ -65,25 +65,25 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
- name: run slower tests
id: slowerTests
uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # tag=v2
with:
arguments: reactor-core:test -Pjunit-tags=slow

Expand All @@ -102,19 +102,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -140,19 +140,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -180,19 +180,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/
plugins {
id "com.gradle.enterprise" version "3.12.4"
id "com.gradle.enterprise" version "3.14.1"
id "org.gradle.toolchains.foojay-resolver-convention" version "0.5.0"
}

Expand Down

0 comments on commit 448c976

Please sign in to comment.