Use .java_version to setup JDK in CI (#5515)

Task/Issue URL: https://app.asana.com/0/488551667048375/1209216610352826/f ### Description Use `.java-version` file to centralise JDK updates across all GH workflows ### Steps to test this PR CI shall pass
duckduckgo · Jan 23, 2025 · 7cbb68e · 7cbb68e
1 parent d5ed5a5
commit 7cbb68e
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 50 deletions.
diff --git a/.github/.java-version b/.github/.java-version
@@ -0,0 +1 @@
+17
diff --git a/.github/workflows/ads-end-to-end.yml b/.github/workflows/ads-end-to-end.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/build-ad-hoc.yml b/.github/workflows/build-ad-hoc.yml
@@ -36,10 +36,10 @@ jobs:
           submodules: recursive
           token: ${{ secrets.GT_DAXMOBILE }}
           ref: ${{ github.event.inputs.app-version }}
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/build-debug-apk.yaml b/.github/workflows/build-debug-apk.yaml
@@ -23,10 +23,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/build-fdroid-apk.yml b/.github/workflows/build-fdroid-apk.yml
@@ -27,10 +27,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: CI Checks
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -28,10 +29,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -50,10 +51,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -83,10 +84,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go
@@ -126,10 +127,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/custom-tabs-nightly.yml b/.github/workflows/custom-tabs-nightly.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -31,10 +31,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle

diff --git a/.github/workflows/e2e-nightly-autofill.yml b/.github/workflows/e2e-nightly-autofill.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/end-to-end-robintest.yml b/.github/workflows/end-to-end-robintest.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/external-css-tests.yml b/.github/workflows/external-css-tests.yml
@@ -40,10 +40,10 @@ jobs:
         working-directory: node_modules/@duckduckgo/content-scope-scripts
         run: npm run build
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Decode secret

diff --git a/.github/workflows/external-ref-tests.yml b/.github/workflows/external-ref-tests.yml
@@ -33,10 +33,10 @@ jobs:
       - name: Copy files
         run: copy-files-from-to
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -80,10 +80,10 @@ jobs:
       - name: Copy files
         run: copy-files-from-to
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Decode secret

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -42,10 +42,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -75,10 +75,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go
@@ -118,10 +118,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/privacy-dashboard-end-to-end.yml b/.github/workflows/privacy-dashboard-end-to-end.yml
@@ -23,10 +23,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/privacy.yml b/.github/workflows/privacy.yml
@@ -28,10 +28,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
@@ -23,10 +23,10 @@ jobs:
           token: ${{ secrets.GT_DAXMOBILE }}
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up ruby env

diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml
@@ -27,10 +27,10 @@ jobs:
           submodules: recursive
           ref: ${{ github.event.inputs.app-version }}
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/release_upload_play_store.yml b/.github/workflows/release_upload_play_store.yml
@@ -29,10 +29,10 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up ruby env

diff --git a/.github/workflows/sync-critical-path.yml b/.github/workflows/sync-critical-path.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create test account for Sync and return the recovery code