Skip to content

Commit f54c139

Browse files
committed
[CI] Use env to setup base Java.
1 parent fd46e73 commit f54c139

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ concurrency:
1717

1818
env:
1919
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
20+
JAVA_VERSION: '17'
2021

2122
permissions:
2223
contents: read
@@ -68,7 +69,7 @@ jobs:
6869
uses: actions/setup-java@v4
6970
with:
7071
distribution: 'zulu'
71-
java-version: 17
72+
java-version: ${{ env.JAVA_VERSION }}
7273
- name: Build with Gradle
7374
run: ./gradlew
7475
- name: Copy test logs
@@ -111,11 +112,11 @@ jobs:
111112
with:
112113
path: ~/.gradle/wrapper
113114
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
114-
- name: Setup java 17 to run the Gradle script
115+
- name: Setup java to run Gradle script
115116
uses: actions/setup-java@v4
116117
with:
117118
distribution: 'zulu'
118-
java-version: 17
119+
java-version: ${{ env.JAVA_VERSION }}
119120
- name: Cache NuGet dependencies
120121
uses: actions/cache@v4
121122
with:
@@ -165,11 +166,11 @@ jobs:
165166
run: |
166167
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
167168
sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev libidn11
168-
- name: Setup java 17 to run the Gradle script
169+
- name: Setup java to run Gradle script
169170
uses: actions/setup-java@v4
170171
with:
171172
distribution: 'zulu'
172-
java-version: 17
173+
java-version: ${{ env.JAVA_VERSION }}
173174
- name: Build
174175
run: ./cppbuild/cppbuild
175176

@@ -205,11 +206,11 @@ jobs:
205206
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
206207
sudo apt-get update
207208
sudo apt-get install -y g++-${{ matrix.version }}
208-
- name: Setup java 17 to run the Gradle script
209+
- name: Setup java to run Gradle script
209210
uses: actions/setup-java@v4
210211
with:
211212
distribution: 'zulu'
212-
java-version: 17
213+
java-version: ${{ env.JAVA_VERSION }}
213214
- name: Build
214215
run: ./cppbuild/cppbuild
215216

@@ -247,11 +248,11 @@ jobs:
247248
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
248249
sudo apt-get update
249250
sudo apt-get install -y clang-${{ matrix.version }} libsparsehash-dev libidn11
250-
- name: Setup java 17 to run the Gradle script
251+
- name: Setup java to run Gradle script
251252
uses: actions/setup-java@v4
252253
with:
253254
distribution: 'zulu'
254-
java-version: 17
255+
java-version: ${{ env.JAVA_VERSION }}
255256
- name: Build
256257
run: ./cppbuild/cppbuild
257258

@@ -289,11 +290,11 @@ jobs:
289290
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
290291
sudo apt-get update
291292
sudo apt-get install -y clang-${{ matrix.version }}
292-
- name: Setup java 17 to run the Gradle script
293+
- name: Setup java to run Gradle script
293294
uses: actions/setup-java@v4
294295
with:
295296
distribution: 'zulu'
296-
java-version: 17
297+
java-version: ${{ env.JAVA_VERSION }}
297298
- name: Build
298299
run: ./cppbuild/cppbuild
299300

@@ -324,11 +325,11 @@ jobs:
324325
with:
325326
path: ~/.gradle/wrapper
326327
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
327-
- name: Setup java 17 to run the Gradle script
328+
- name: Setup java to run Gradle script
328329
uses: actions/setup-java@v4
329330
with:
330331
distribution: 'zulu'
331-
java-version: 17
332+
java-version: ${{ env.JAVA_VERSION }}
332333
- name: Build
333334
run: cmake --version && ./cppbuild/cppbuild
334335

@@ -359,11 +360,11 @@ jobs:
359360
with:
360361
path: ~/.gradle/wrapper
361362
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
362-
- name: Setup java 17 to run the Gradle script
363+
- name: Setup java to run Gradle script
363364
uses: actions/setup-java@v4
364365
with:
365366
distribution: 'zulu'
366-
java-version: 17
367+
java-version: ${{ env.JAVA_VERSION }}
367368
- name: Build
368369
run: cppbuild/cppbuild.cmd
369370

@@ -395,11 +396,11 @@ jobs:
395396
uses: dtolnay/rust-toolchain@stable
396397
with:
397398
toolchain: ${{ matrix.rust }}
398-
- name: Setup java 17 to run the Gradle script
399+
- name: Setup java to run Gradle script
399400
uses: actions/setup-java@v4
400401
with:
401402
distribution: 'zulu'
402-
java-version: 17
403+
java-version: ${{ env.JAVA_VERSION }}
403404
- run: ./gradlew runRustTests
404405

405406
golang-build:
@@ -430,11 +431,11 @@ jobs:
430431
uses: actions/setup-go@v4
431432
with:
432433
go-version: ${{ matrix.version }}
433-
- name: Setup java 17 to run the Gradle script
434+
- name: Setup java to run Gradle script
434435
uses: actions/setup-java@v4
435436
with:
436437
distribution: 'zulu'
437-
java-version: 17
438+
java-version: ${{ env.JAVA_VERSION }}
438439
- name: Generate jar
439440
run: ./gradlew assemble
440441
- name: Run tests

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ concurrency:
1212

1313
env:
1414
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
15+
JAVA_VERSION: '17'
1516

1617
jobs:
1718
ci:
@@ -47,7 +48,7 @@ jobs:
4748
uses: actions/setup-java@v4
4849
with:
4950
distribution: 'zulu'
50-
java-version: 17
51+
java-version: ${{ env.JAVA_VERSION }}
5152
- name: Publish with Gradle
5253
run: ./gradlew publish
5354
env:

.github/workflows/slow.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ concurrency:
1414

1515
env:
1616
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
17+
JAVA_VERSION: '17'
1718

1819
permissions:
1920
contents: read
@@ -42,11 +43,11 @@ jobs:
4243
java -Xinternalversion
4344
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
4445
echo "BUILD_JAVA_VERSION=${{ matrix.java }}" >> $GITHUB_ENV
45-
- name: Setup java 17 to run the Gradle script
46+
- name: Setup java to run Gradle script
4647
uses: actions/setup-java@v3
4748
with:
4849
distribution: 'zulu'
49-
java-version: 17
50+
java-version: ${{ env.JAVA_VERSION }}
5051
- name: Setup dotnet
5152
uses: actions/setup-dotnet@v2
5253
with:

0 commit comments

Comments
 (0)