[CI] Use env to setup base Java.

aeron-io · Jan 16, 2025 · f54c139 · f54c139
1 parent fd46e73
commit f54c139
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ concurrency:
 
 env:
   GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
+  JAVA_VERSION: '17'
 
 permissions:
   contents: read
@@ -68,7 +69,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build with Gradle
         run: ./gradlew
       - name: Copy test logs
@@ -111,11 +112,11 @@ jobs:
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Cache NuGet dependencies
         uses: actions/cache@v4
         with:
@@ -165,11 +166,11 @@ jobs:
         run: |
           sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
           sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev libidn11
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build
         run: ./cppbuild/cppbuild
 
@@ -205,11 +206,11 @@ jobs:
           sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
           sudo apt-get update
           sudo apt-get install -y g++-${{ matrix.version }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build
         run: ./cppbuild/cppbuild
 
@@ -247,11 +248,11 @@ jobs:
           echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/focal/ llvm-toolchain-focal-${{ matrix.version }} main" | sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt-get update
           sudo apt-get install -y clang-${{ matrix.version }} libsparsehash-dev libidn11
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build
         run: ./cppbuild/cppbuild
 
@@ -289,11 +290,11 @@ jobs:
           echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.version }} main" | sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt-get update
           sudo apt-get install -y clang-${{ matrix.version }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build
         run: ./cppbuild/cppbuild
 
@@ -324,11 +325,11 @@ jobs:
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build
         run: cmake --version && ./cppbuild/cppbuild
 
@@ -359,11 +360,11 @@ jobs:
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Build
         run: cppbuild/cppbuild.cmd
 
@@ -395,11 +396,11 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.rust }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - run: ./gradlew runRustTests
 
   golang-build:
@@ -430,11 +431,11 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.version }}
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Generate jar
         run: ./gradlew assemble
       - name: Run tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,6 +12,7 @@ concurrency:
 
 env:
   GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
+  JAVA_VERSION: '17'
 
 jobs:
   ci:
@@ -47,7 +48,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Publish with Gradle
         run: ./gradlew publish
         env:

diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml
@@ -14,6 +14,7 @@ concurrency:
 
 env:
   GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
+  JAVA_VERSION: '17'
 
 permissions:
   contents: read
@@ -42,11 +43,11 @@ jobs:
           java -Xinternalversion
           echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
           echo "BUILD_JAVA_VERSION=${{ matrix.java }}" >> $GITHUB_ENV
-      - name: Setup java 17 to run the Gradle script
+      - name: Setup java to run Gradle script
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with: