From f538921839d966312508f424512814f4230bf178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?=
 <148013+szpak@users.noreply.github.com>
Date: Wed, 15 May 2024 16:28:51 +0200
Subject: [PATCH] JDK 22 CI build (#1935)

Improved the visibility in GitHub Actions UI by changing the order of matrix variables.
---
 .github/workflows/branches-and-prs.yml        | 39 ++++++++++---------
 .github/workflows/release.yml                 | 39 ++++++++++---------
 .../smoke/extension/RequiresExtension.groovy  |  2 +-
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/branches-and-prs.yml b/.github/workflows/branches-and-prs.yml
index 59e42a82f9..83c0753656 100644
--- a/.github/workflows/branches-and-prs.yml
+++ b/.github/workflows/branches-and-prs.yml
@@ -19,35 +19,38 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest']
         variant: ['2.5', '3.0', '4.0']
-        java: ['8', '11', '17', '21']
+        java: ['8', '11', '17', '21', '22']
+        os: ['ubuntu-latest']
         exclude:
-          - os: 'ubuntu-latest'
-            variant: '2.5'
+          - variant: '2.5'
             java: '17'
-          - os: 'ubuntu-latest'
-            variant: '2.5'
+            os: 'ubuntu-latest'
+          - variant: '2.5'
             java: '21'
+            os: 'ubuntu-latest'
+          - variant: '2.5'
+            java: '22'
+            os: 'ubuntu-latest'
         include:
-          - os: 'windows-latest'
-            variant: '2.5'
+          - variant: '2.5'
             java: '8'
-          - os: 'windows-latest'
-            variant: '3.0'
+            os: 'windows-latest'
+          - variant: '3.0'
             java: '8'
-          - os: 'windows-latest'
-            variant: '4.0'
+            os: 'windows-latest'
+          - variant: '4.0'
             java: '8'
-          - os: 'macos-latest'
-            variant: '2.5'
+            os: 'windows-latest'
+          - variant: '2.5'
             java: '8'
-          - os: 'macos-latest'
-            variant: '3.0'
+            os: 'macos-latest'
+          - variant: '3.0'
             java: '8'
-          - os: 'macos-latest'
-            variant: '4.0'
+            os: 'macos-latest'
+          - variant: '4.0'
             java: '8'
+            os: 'macos-latest'
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 38cd10d516..75b7dd4bf2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,35 +14,38 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'ubuntu-latest' ]
         variant: ['2.5', '3.0', '4.0']
-        java: [ '8', '11', '17', '21' ]
+        java: [ '8', '11', '17', '21', '22' ]
+        os: [ 'ubuntu-latest' ]
         exclude:
-          - os: 'ubuntu-latest'
-            variant: '2.5'
+          - variant: '2.5'
             java: '17'
-          - os: 'ubuntu-latest'
-            variant: '2.5'
+            os: 'ubuntu-latest'
+          - variant: '2.5'
             java: '21'
+            os: 'ubuntu-latest'
+          - variant: '2.5'
+            java: '22'
+            os: 'ubuntu-latest'
         include:
-          - os: 'windows-latest'
-            variant: '2.5'
+          - variant: '2.5'
             java: '8'
-          - os: 'windows-latest'
-            variant: '3.0'
+            os: 'windows-latest'
+          - variant: '3.0'
             java: '8'
-          - os: 'windows-latest'
-            variant: '4.0'
+            os: 'windows-latest'
+          - variant: '4.0'
             java: '8'
-          - os: 'macos-latest'
-            variant: '2.5'
+            os: 'windows-latest'
+          - variant: '2.5'
             java: '8'
-          - os: 'macos-latest'
-            variant: '3.0'
+            os: 'macos-latest'
+          - variant: '3.0'
             java: '8'
-          - os: 'macos-latest'
-            variant: '4.0'
+            os: 'macos-latest'
+          - variant: '4.0'
             java: '8'
+            os: 'macos-latest'
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/extension/RequiresExtension.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/extension/RequiresExtension.groovy
index 649b5a0570..b79f5bc004 100644
--- a/spock-specs/src/test/groovy/org/spockframework/smoke/extension/RequiresExtension.groovy
+++ b/spock-specs/src/test/groovy/org/spockframework/smoke/extension/RequiresExtension.groovy
@@ -447,7 +447,7 @@ class Test extends Bar {
 
     @Requires({
       jvm.java8 || jvm.java9 || jvm.java10 || jvm.java11 || jvm.java12 || jvm.java13 || jvm.java14 || jvm.java15 || jvm.java16 || jvm.java17 ||
-        jvm.isJavaVersion(18) || jvm.java21
+        jvm.isJavaVersion(18) || jvm.java21 || jvm.java22
     })
     def "provides JVM information"() {
       expect: true