update CI to test on JDK 21 (#1081)

Switches back to zulu distribution because temurin is slow to get the updated release out.
Netflix · Oct 4, 2023 · 0af36c0 · 0af36c0
1 parent 19e5a8f
commit 0af36c0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -11,25 +11,25 @@ jobs:
           fetch-depth: 0
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 20
-          distribution: 'temurin'
+          java-version: 21
+          distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK20=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK21=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
           java-version: 8
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
       - name: Build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,25 +14,25 @@ jobs:
       - uses: actions/checkout@v3
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 20
-          distribution: 'temurin'
+          java-version: 21
+          distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK20=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK21=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
           java-version: 8
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
       - name: Build candidate

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -16,25 +16,25 @@ jobs:
           fetch-depth: 0
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 20
-          distribution: 'temurin'
+          java-version: 21
+          distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK20=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK21=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
           java-version: 8
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
       - name: Build

diff --git a/build.gradle b/build.gradle
@@ -71,7 +71,7 @@ subprojects {
     useJUnitPlatform()
   }
 
-  [17, 20].each { additionalJDK ->
+  [17, 21].each { additionalJDK ->
     def additionalTestTask = tasks.register("testJDK$additionalJDK", Test) {
       description = "Runs tests against JDK $additionalJDK."
       group = 'verification'