From 371125469210d1de9d3e602dced904350ce8df35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 05:30:06 +0000 Subject: [PATCH 1/3] Bump actions/setup-java from 1 to 2.1.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 2.1.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...v2.1.0) Signed-off-by: dependabot[bot] --- .github/workflows/ci-examples.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml index cea7180566d..e3f540065e3 100644 --- a/.github/workflows/ci-examples.yml +++ b/.github/workflows/ci-examples.yml @@ -15,7 +15,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' - name: Cache Gradle Home files @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' - name: Cache Gradle Home files diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f49b6426a2e..727c89f22f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' - name: Cache Gradle Home files @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' - name: Cache Gradle Home files From 3844712431165501f9238cc30a6c6d7c34fb64fa Mon Sep 17 00:00:00 2001 From: Richard North Date: Tue, 8 Jun 2021 14:31:27 +0100 Subject: [PATCH 2/3] Add `distribution` config to fix build --- .github/workflows/ci-examples.yml | 2 ++ .github/workflows/ci.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml index e3f540065e3..cd696de7edd 100644 --- a/.github/workflows/ci-examples.yml +++ b/.github/workflows/ci-examples.yml @@ -18,6 +18,7 @@ jobs: - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' + distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 continue-on-error: true @@ -45,6 +46,7 @@ jobs: - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' + distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 continue-on-error: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 727c89f22f4..0bc9d517322 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' + distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 with: @@ -43,6 +44,7 @@ jobs: - uses: actions/setup-java@v2.1.0 with: java-version: '1.8' + distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 continue-on-error: true From 669cc53419c30b7d211f44fb93802a34729b8c20 Mon Sep 17 00:00:00 2001 From: Richard North Date: Tue, 8 Jun 2021 16:55:01 +0100 Subject: [PATCH 3/3] Change java-version format --- .github/workflows/ci-examples.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml index cd696de7edd..83c74833563 100644 --- a/.github/workflows/ci-examples.yml +++ b/.github/workflows/ci-examples.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2.1.0 with: - java-version: '1.8' + java-version: '8.0.292+10' distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 @@ -45,7 +45,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2.1.0 with: - java-version: '1.8' + java-version: '8.0.292+10' distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bc9d517322..a84b9fa6723 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2.1.0 with: - java-version: '1.8' + java-version: '8.0.292+10' distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3 @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2.1.0 with: - java-version: '1.8' + java-version: '8.0.292+10' distribution: adopt-hotspot - name: Cache Gradle Home files uses: actions/cache@v2.1.3