From 6b25b85c5832654c65ad00dfbea3e47a8ea5e1ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 06:00:24 +0000 Subject: [PATCH 1/2] Bump actions/setup-java from v1 to v2 Bumps [actions/setup-java](https://github.com/actions/setup-java) from v1 to v2. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...8764a52df183aa0ccea74521dfd9d506ffc7a19a) Signed-off-by: dependabot[bot] --- .github/workflows/build_and_test.yml | 4 ++-- .github/workflows/detekt.yml | 2 +- .github/workflows/diktat.yml | 2 +- .github/workflows/diktat_snapshot.yml | 2 +- .github/workflows/metrics_for_master.yml | 2 +- .github/workflows/release.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 48ff9cf0dc..3cdc90de88 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -12,7 +12,7 @@ jobs: # actions/checkout v1.* is needed for correct codecov upload, see github issues for details - uses: actions/checkout@v1 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository @@ -96,7 +96,7 @@ jobs: steps: - uses: actions/checkout@v2.3.3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index b1a78105ba..4cc295301c 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2.3.3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 70d08e9c95..046f7e0050 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -16,7 +16,7 @@ jobs: # set this to 0 to fetch all tags too and be able to use them later fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository diff --git a/.github/workflows/diktat_snapshot.yml b/.github/workflows/diktat_snapshot.yml index 7ec79c34f4..2180c68309 100644 --- a/.github/workflows/diktat_snapshot.yml +++ b/.github/workflows/diktat_snapshot.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2.3.3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository (shared with regular CI build) diff --git a/.github/workflows/metrics_for_master.yml b/.github/workflows/metrics_for_master.yml index 5092727af3..dbf6f50b97 100644 --- a/.github/workflows/metrics_for_master.yml +++ b/.github/workflows/metrics_for_master.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2.3.3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc9cf2750a..097cf66ea7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v2.3.3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 1.11 - name: Cache local Maven repository From f6d6544cbad0bde52ad0ba3b5b746d940d99e7ed Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Mon, 12 Apr 2021 10:52:48 +0300 Subject: [PATCH 2/2] actions/setup-java@v2 ### What's done: * Specify distribution explicitly --- .github/workflows/build_and_test.yml | 6 ++++-- .github/workflows/detekt.yml | 3 ++- .github/workflows/diktat.yml | 3 ++- .github/workflows/diktat_snapshot.yml | 3 ++- .github/workflows/metrics_for_master.yml | 3 ++- .github/workflows/release.yml | 3 ++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3cdc90de88..8e61683017 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -14,7 +14,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 with: @@ -98,7 +99,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index 4cc295301c..521ade4586 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -15,7 +15,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 046f7e0050..1b98b6b4d0 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -18,7 +18,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/diktat_snapshot.yml b/.github/workflows/diktat_snapshot.yml index 2180c68309..f213c4028a 100644 --- a/.github/workflows/diktat_snapshot.yml +++ b/.github/workflows/diktat_snapshot.yml @@ -18,7 +18,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository (shared with regular CI build) uses: actions/cache@v2 with: diff --git a/.github/workflows/metrics_for_master.yml b/.github/workflows/metrics_for_master.yml index dbf6f50b97..065d25d1c7 100644 --- a/.github/workflows/metrics_for_master.yml +++ b/.github/workflows/metrics_for_master.yml @@ -18,7 +18,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 # keys are the same as in build_and_test workflow to make cache available for PRs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 097cf66ea7..2bfcd0de8e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: zulu + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 with: