Skip to content

Commit e83b903

Browse files
committed
another attempt at running Gradle on 26 and code on 27
1 parent 748b186 commit e83b903

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

.github/workflows/gradle_preview_jdks.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,13 @@ permissions:
1414

1515
jobs:
1616
build:
17+
runs-on: ubuntu-latest
18+
continue-on-error: true
1719
strategy:
18-
fail-fast: false # important: don't cancel other matrix jobs on failure
20+
fail-fast: false
1921
matrix:
20-
java-version:
21-
- 27-ea # experimental/upcoming - allowed to fail
22-
include:
23-
- java-version: 27-ea
24-
distribution: temurin
25-
experimental: true
22+
jdk: [27] # add 28-ea etc. later
2623

27-
runs-on: ubuntu-latest
28-
env:
29-
jdk: ${{ matrix.java-version }}
3024
steps:
3125
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3226
- name: Set up JDK 26
@@ -36,11 +30,11 @@ jobs:
3630
java-version: '26'
3731
cache: gradle
3832

39-
- name: Set up JDK ${{ matrix.java-version }}
33+
- name: Set up JDK ${{ matrix.jdk }}-ea
4034
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4135
with:
42-
distribution: ${{ matrix.distribution || 'temurin' }}
43-
java-version: ${{ matrix.java-version }}
36+
distribution: 'temurin'
37+
java-version: '${{ matrix.jdk }}-ea'
4438

4539
- name: Cache Gradle packages
4640
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
@@ -52,10 +46,11 @@ jobs:
5246
run: chmod +x gradlew
5347

5448
- name: Run Validity Tests Upfront
49+
env:
50+
JDK_EXPERIMENTAL: ${{ matrix.jdk }}
5551
run: ./gradlew test --tests "io.reactivex.rxjava4.validators.*" --stacktrace --no-daemon
5652
- name: Build RxJava
5753
run: ./gradlew build --stacktrace
5854
- name: Generate Javadoc
5955
run: ./gradlew javadoc --stacktrace
6056

61-
continue-on-error: ${{ matrix.experimental || false }}

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,17 @@ dependencies {
5454
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$jupiterLauncherVersion" // match your JUnit version family
5555
}
5656

57-
def jdk = "26"
58-
def experiment = System.getenv("jdk");
59-
if (experiment != null && !"".equals(experiment)) {
60-
jdk = experiment.replace("-ea", "")
57+
// === Experimental JDK handling for Outreach Program ===
58+
def experimental = System.getenv("JDK_EXPERIMENTAL")
59+
def toolchainJdk = "26" // default / baseline
60+
61+
if (experimental != null && !experimental.trim().isEmpty()) {
62+
toolchainJdk = experimental // e.g. "27"
6163
}
6264

6365
java {
6466
toolchain {
65-
// vendor = JvmVendorSpec.ADOPTIUM <-- for now
66-
languageVersion = JavaLanguageVersion.of(jdk)
67+
languageVersion = JavaLanguageVersion.of(toolchainJdk)
6768
}
6869
sourceCompatibility = JavaVersion.VERSION_26
6970
targetCompatibility = JavaVersion.VERSION_26

0 commit comments

Comments
 (0)