Skip to content

Commit 516a1fd

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.
1 parent 34d49ae commit 516a1fd

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

.github/workflows/maven.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818

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

2224
- name: Cache Maven dependencies
2325
uses: actions/cache@v3
@@ -45,8 +47,10 @@ jobs:
4547
steps:
4648
- uses: actions/checkout@v3
4749

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

5155
- name: Cache Maven dependencies
5256
uses: actions/cache@v3
@@ -79,14 +83,12 @@ jobs:
7983
- uses: actions/checkout@v3
8084

8185
- name: Setup JDK ${{ matrix.java }}
82-
id: setup-test-java
8386
uses: actions/setup-java@v3
8487
with:
85-
java-version: ${{ matrix.java }}
8688
distribution: temurin
87-
88-
- name: Setup environment
89-
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
89+
java-version: |
90+
${{ matrix.java }}
91+
8
9092
9193
- name: Cache Maven dependencies
9294
uses: actions/cache@v3
@@ -100,7 +102,7 @@ jobs:
100102

101103
- name: Build with Maven
102104
id: maven-build
103-
run: mvn -B -U -ntp verify --fail-at-end "-Dinvoker.javaHome=${{ steps.setup-test-java.outputs.path }}"
105+
run: mvn -B -U -ntp verify --fail-at-end "-Dinvoker.javaHome=$JAVA_HOME_${{ matrix.java }}_X64"
104106

105107
- name: Store reports
106108
if: steps.maven-build.outcome == 'success' || steps.maven-build.outcome == 'failure'
@@ -123,8 +125,10 @@ jobs:
123125
steps:
124126
- uses: actions/checkout@v3
125127

126-
- name: Setup environment
127-
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
128+
- uses: actions/setup-java@v3
129+
with:
130+
distribution: 'temurin'
131+
java-version: '8'
128132

129133
- name: Cache Maven dependencies
130134
uses: actions/cache@v3
@@ -160,8 +164,10 @@ jobs:
160164
steps:
161165
- uses: actions/checkout@v3
162166

163-
- name: Setup environment
164-
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" | tee -a $GITHUB_ENV
167+
- uses: actions/setup-java@v3
168+
with:
169+
distribution: 'temurin'
170+
java-version: '11'
165171

166172
- name: Cache Maven dependencies
167173
uses: actions/cache@v3

0 commit comments

Comments
 (0)