Issue #17701: update Cirrus CI configuration to use Temurin JDK instead of OpenJDK

Brijeshthummar02 · romani · commit 1e22276f781b · 2025-08-27T20:38:10.000-07:00
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -8,7 +8,7 @@ task:
     - git clone --recursive
           https://x-access-token:%CIRRUS_REPO_CLONE_TOKEN%@github.com/%CIRRUS_REPO_FULL_NAME%.git
           %CIRRUS_WORKING_DIR%/ci
-    - set "JAVA_HOME=%ProgramFiles%\OpenJDK\%OPENJDK_PATH%"
+    - set "JAVA_HOME=%ProgramFiles%\%TEMURIN_PATH%"
     - set "PATH=%JAVA_HOME%\bin;%PATH%"
     - cd ci
     - cmd /c "if defined CIRRUS_PR (git fetch origin pull/%CIRRUS_PR%/head:pull/%CIRRUS_PR%)"
@@ -25,8 +25,8 @@ task:
     # add more JDK versions here
     - name: Cirrus - JDK21
       env:
-        OPENJDK_VERSION: "21.0.6"
-        OPENJDK_PATH: "jdk-21"
+        TEMURIN_VERSION: "21.0.6.7"
+        TEMURIN_PATH: 'Eclipse Adoptium\jdk-21'
   env:
     # disable ANSI output for picocli (may affect tests)
     NO_COLOR: "1"
@@ -38,32 +38,33 @@ task:
     - choco config set cacheLocation %CIRRUS_WORKING_DIR%/.chocolatey
     - choco upgrade -y chocolatey
     - choco install -y --no-progress ant
-    - choco install -y --no-progress openjdk --version %OPENJDK_VERSION%
-    - set "JAVA_HOME=%ProgramFiles%\OpenJDK\%OPENJDK_PATH%"
+    - choco install -y --no-progress temurin --version %TEMURIN_VERSION%
+    - refreshenv
+    - set "JAVA_HOME=%ProgramFiles%\%TEMURIN_PATH%"
     - set "PATH=%JAVA_HOME%\bin;%PATH%"
     - java -version
     - javac -version
 
   version_script:
-    - set "JAVA_HOME=%ProgramFiles%\OpenJDK\%OPENJDK_PATH%"
+    - set "JAVA_HOME=%ProgramFiles%\%TEMURIN_PATH%"
     - set "PATH=%JAVA_HOME%\bin;%PATH%"
     - set
     - ant -version
     - java --version
     # - xsltproc --version
     # - xml --version
   sevntu_script:
-    - set "JAVA_HOME=%ProgramFiles%\OpenJDK\%OPENJDK_PATH%"
+    - set "JAVA_HOME=%ProgramFiles%\%TEMURIN_PATH%"
     - set "PATH=%JAVA_HOME%\bin;%PATH%"
     - cd ci
     - .ci/validation.cmd sevntu
   verify_without_checkstyle_script:
-    - set "JAVA_HOME=%ProgramFiles%\OpenJDK\%OPENJDK_PATH%"
+    - set "JAVA_HOME=%ProgramFiles%\%TEMURIN_PATH%"
     - set "PATH=%JAVA_HOME%\bin;%PATH%"
     - cd ci
     - .ci/validation.cmd verify_without_checkstyle
   site_without_verify_script:
-    - set "JAVA_HOME=%ProgramFiles%\OpenJDK\%OPENJDK_PATH%"
+    - set "JAVA_HOME=%ProgramFiles%\%TEMURIN_PATH%"
     - set "PATH=%JAVA_HOME%\bin;%PATH%"
     - cd ci
     - .ci/validation.cmd site_without_verify
diff --git a/config/jsoref-spellchecker/whitelist.words b/config/jsoref-spellchecker/whitelist.words
@@ -14,6 +14,7 @@ acm
 Aconfig
 actionlint
 addons
+Adoptium
 adr
 AFBR
 AFilter
@@ -1166,6 +1167,7 @@ redundantmodifier
 refactor
 refactoring
 refid
+refreshenv
 regex
 regexp
 regexpheader
