Skip to content

Commit 53ee0bd

Browse files
committed
Use actions/setup-java to setup JAVA_HOME
This should have no impact as the action should use the preinstalled JDKs anyway. Also update other actions (besides gradle-build-action)
1 parent 2c4afc6 commit 53ee0bd

File tree

1 file changed

+28
-16
lines changed

1 file changed

+28
-16
lines changed

.github/workflows/gradle.yaml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ jobs:
1717
linux:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121

22-
- name: Setup environment
23-
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
22+
- uses: actions/setup-java@v3
23+
with:
24+
distribution: 'temurin'
25+
java-version: '8'
2426

2527
- name: Build with Gradle
2628
id: gradle-build
@@ -34,18 +36,20 @@ jobs:
3436

3537
- name: Store reports
3638
if: always() && (steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure')
37-
uses: actions/upload-artifact@v2
39+
uses: actions/upload-artifact@v3
3840
with:
3941
name: linux-reports
4042
path: build/reports/
4143

4244
windows:
4345
runs-on: windows-latest
4446
steps:
45-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v3
4648

47-
- name: Setup environment
48-
run: echo "JAVA_HOME=${Env:JAVA_HOME_8_X64}" | Tee-Object -FilePath $env:GITHUB_ENV -Append
49+
- uses: actions/setup-java@v3
50+
with:
51+
distribution: 'temurin'
52+
java-version: '8'
4953

5054
- name: Build with Gradle
5155
id: gradle-build
@@ -59,7 +63,7 @@ jobs:
5963

6064
- name: Store reports
6165
if: always() && (steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure')
62-
uses: actions/upload-artifact@v2
66+
uses: actions/upload-artifact@v3
6367
with:
6468
name: windows-reports
6569
path: build/reports/
@@ -71,16 +75,18 @@ jobs:
7175
matrix:
7276
gradle: [ '7.4.2', '7.3.3', '7.2', '7.1.1', '7.0.2', '6.9.1', '6.8.3' ]
7377
steps:
74-
- uses: actions/checkout@v2
78+
- uses: actions/checkout@v3
7579

7680
- name: Cache Gradle test wrapper (${{ matrix.gradle }})
77-
uses: actions/cache@v1
81+
uses: actions/cache@v3
7882
with:
7983
path: ~/.gradle/wrapper/dists/gradle-${{ matrix.gradle }}-bin/
8084
key: wrapper-${{ matrix.gradle }}
8185

82-
- name: Setup environment
83-
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
86+
- uses: actions/setup-java@v3
87+
with:
88+
distribution: 'temurin'
89+
java-version: '8'
8490

8591
- name: Build with Gradle
8692
id: gradle-build
@@ -94,7 +100,7 @@ jobs:
94100

95101
- name: Store reports
96102
if: always() && (steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure')
97-
uses: actions/upload-artifact@v2
103+
uses: actions/upload-artifact@v3
98104
with:
99105
name: gradle-${{ matrix.gradle }}-tests
100106
path: build/reports/tests/test/
@@ -106,11 +112,17 @@ jobs:
106112
matrix:
107113
java: [ 11, 17 ]
108114
steps:
109-
- uses: actions/checkout@v2
115+
- uses: actions/checkout@v3
116+
117+
- uses: actions/setup-java@v3
118+
with:
119+
distribution: 'temurin'
120+
java-version: |
121+
${{ matrix.java }}
122+
8
110123
111124
- name: Setup environment
112125
run: |
113-
echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
114126
echo "org.gradle.java.installations.auto-download=false" | tee -a gradle.properties
115127
echo "org.gradle.java.installations.fromEnv=JAVA_HOME_${{ matrix.java }}_X64" | tee -a gradle.properties
116128
@@ -126,7 +138,7 @@ jobs:
126138

127139
- name: Store reports
128140
if: always() && (steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure')
129-
uses: actions/upload-artifact@v2
141+
uses: actions/upload-artifact@v3
130142
with:
131143
name: jdk-${{ matrix.java }}-tests
132144
path: build/reports/tests/test/

0 commit comments

Comments
 (0)