Skip to content

Commit 5bad869

Browse files
author
Anuraag Agrawal
authored
Update to setup java v2 (open-telemetry#3115)
1 parent ac6d03b commit 5bad869

6 files changed

Lines changed: 18 additions & 15 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ jobs:
1919
languages: java
2020

2121
- name: Setup Java 11
22-
uses: actions/setup-java@v1
22+
uses: actions/setup-java@v2
2323
with:
24+
distribution: adopt
2425
java-version: 11
2526

2627
- name: Autobuild

.github/workflows/main-build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ jobs:
2424
fetch-depth: 0
2525
- id: setup-java-8
2626
name: Setup Java 8
27-
uses: actions/setup-java@v1
27+
uses: actions/setup-java@v2
2828
with:
29+
distribution: adopt
2930
java-version: 8
3031
java-package: jre
3132
- id: setup-java-11
3233
name: Setup Java 11
33-
uses: actions/setup-java@v1
34+
uses: actions/setup-java@v2
3435
with:
36+
distribution: adopt
3537
java-version: 11
3638
- uses: burrunan/gradle-cache-action@v1.10
3739
with:
@@ -58,8 +60,9 @@ jobs:
5860
fetch-depth: 0
5961
- id: setup-java-11
6062
name: Setup Java 11
61-
uses: actions/setup-java@v1
63+
uses: actions/setup-java@v2
6264
with:
65+
distribution: adopt
6366
java-version: 11
6467
- uses: burrunan/gradle-cache-action@v1.10
6568
with:

.github/workflows/patch-release-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ jobs:
4949
uses: actions/checkout@v2
5050
with:
5151
ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}
52-
- uses: actions/setup-java@v1
52+
- uses: actions/setup-java@v2
5353
with:
54+
distribution: adopt
5455
java-version: 11
5556
- name: Setup git name
5657
run: |

.github/workflows/pr-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ jobs:
2424
fetch-depth: 0
2525
- id: setup-java-8
2626
name: Setup Java 8
27-
uses: actions/setup-java@v1
27+
uses: actions/setup-java@v2
2828
with:
29+
distribution: adopt
2930
java-version: 8
3031
java-package: jre
3132
- id: setup-java-11
3233
name: Setup Java 11
33-
uses: actions/setup-java@v1
34+
uses: actions/setup-java@v2
3435
with:
36+
distribution: adopt
3537
java-version: 11
3638
- uses: burrunan/gradle-cache-action@v1.10
3739
with:

.github/workflows/pr-examples-build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,11 @@ jobs:
2121
coverage: true
2222
steps:
2323
- uses: actions/checkout@v2
24-
- id: setup-java-8
25-
name: Setup Java 8
26-
uses: actions/setup-java@v1
27-
with:
28-
java-version: 8
29-
java-package: jre
3024
- id: setup-java-11
3125
name: Setup Java 11
32-
uses: actions/setup-java@v1
26+
uses: actions/setup-java@v2
3327
with:
28+
distribution: adopt
3429
java-version: 11
3530
- uses: burrunan/gradle-cache-action@v1.10
3631
with:

.github/workflows/release-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ jobs:
1313
runs-on: ubuntu-18.04
1414
steps:
1515
- uses: actions/checkout@v2
16-
- uses: actions/setup-java@v1
16+
- uses: actions/setup-java@v2
1717
with:
18+
distribution: adopt
1819
java-version: 11
1920
- uses: burrunan/gradle-cache-action@v1.10
2021
with:

0 commit comments

Comments
 (0)