From 309b67f91e182bdf0d80d53f8564e69232f3ebd8 Mon Sep 17 00:00:00 2001 From: sullis Date: Thu, 25 Nov 2021 23:05:47 -0800 Subject: [PATCH] update GitHub Actions (#10963) - use setup-java v2 everywhere - use Temurin JDK everywhere --- .../workflows/check-supported-versions.yaml | 2 +- .github/workflows/gradle-test.yaml | 2 +- .github/workflows/openapi-generator.yaml | 18 ++++++++++++------ .github/workflows/samples-dart.yaml | 4 ++-- .github/workflows/samples-kotlin.yaml | 2 +- .github/workflows/sonar.yml | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-supported-versions.yaml b/.github/workflows/check-supported-versions.yaml index ba496f3ab5c3..017b4bdf0ab4 100644 --- a/.github/workflows/check-supported-versions.yaml +++ b/.github/workflows/check-supported-versions.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: ${{ matrix.java }} - uses: actions/cache@v2.1.7 diff --git a/.github/workflows/gradle-test.yaml b/.github/workflows/gradle-test.yaml index 6be454c68a6b..c6f6f495ab17 100644 --- a/.github/workflows/gradle-test.yaml +++ b/.github/workflows/gradle-test.yaml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 11 # Cache Gradle Dependencies - name: Setup Gradle Dependencies Cache diff --git a/.github/workflows/openapi-generator.yaml b/.github/workflows/openapi-generator.yaml index a5defde9826d..b2e477592d48 100644 --- a/.github/workflows/openapi-generator.yaml +++ b/.github/workflows/openapi-generator.yaml @@ -17,9 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 + distribution: 'temurin' - name: Cache maven dependencies uses: actions/cache@v2.1.7 env: @@ -52,9 +53,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 + distribution: 'temurin' - name: Cache maven dependencies uses: actions/cache@v2.1.7 env: @@ -86,9 +88,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 + distribution: 'temurin' - name: Download openapi-generator-cli.jar artifact uses: actions/download-artifact@v2.0.10 with: @@ -124,9 +127,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 + distribution: 'temurin' - name: Download openapi-generator-cli.jar artifact uses: actions/download-artifact@v2.0.10 with: @@ -158,9 +162,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 + distribution: 'temurin' - name: Cache maven dependencies uses: actions/cache@v2.1.7 env: @@ -190,9 +195,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 + distribution: 'temurin' - name: Cache maven dependencies uses: actions/cache@v2.1.7 env: diff --git a/.github/workflows/samples-dart.yaml b/.github/workflows/samples-dart.yaml index e4c94f3f1255..5efe3b6b686f 100644 --- a/.github/workflows/samples-dart.yaml +++ b/.github/workflows/samples-dart.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Cache maven dependencies uses: actions/cache@v2.1.7 @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Cache maven dependencies uses: actions/cache@v2.1.7 diff --git a/.github/workflows/samples-kotlin.yaml b/.github/workflows/samples-kotlin.yaml index 39a7ea7c9576..c6f6f3745c0f 100644 --- a/.github/workflows/samples-kotlin.yaml +++ b/.github/workflows/samples-kotlin.yaml @@ -45,7 +45,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Cache maven dependencies uses: actions/cache@v2.1.7 diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index d991e052a7d6..63f622d66e10 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -16,7 +16,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 11 - name: Compile with Maven run: mvn -B -q clean install jacoco:report