Merge remote-tracking branch 'origin/1.x'

ao-apps · May 1, 2024 · a75cb71 · a75cb71
2 parents 531b061 + 1d10336
commit a75cb71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          # Matches Jenkinsfile:deployJdk
+          java-version: 21
           distribution: 'oracle'
       - name: Setup Maven
         uses: stCarolas/setup-maven@v.4.5

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -134,6 +134,7 @@ def upstreamProjects = [
 
 // JDK versions
 if (!binding.hasVariable('deployJdk')) {
+  // Matches build.yml:java-version
   binding.setVariable('deployJdk', '21')
 }
 if (!binding.hasVariable('buildJdks')) {

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -153,6 +153,7 @@ def upstreamProjects = [
 
 // JDK versions
 if (!binding.hasVariable('deployJdk')) {
+  // Matches build.yml:java-version
   binding.setVariable('deployJdk', '21')
 }
 if (!binding.hasVariable('buildJdks')) {