From 2e71e85b8df37851b335baa3a9551b60c4e13958 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Mon, 6 May 2024 16:37:09 -0400 Subject: [PATCH] switch CI to temurin jdk (#6592) --- .github/workflows/comment-command.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/gradle.yml | 6 +++--- .github/workflows/lint-format.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/comment-command.yml b/.github/workflows/comment-command.yml index 8277499c38..2fdbe2e301 100644 --- a/.github/workflows/comment-command.yml +++ b/.github/workflows/comment-command.yml @@ -40,7 +40,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 17 - name: Install wpiformat run: pip3 install wpiformat==2024.34 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index c1d14c1d8b..79fa850e11 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -22,7 +22,7 @@ jobs: persist-credentials: false - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 13 - name: Set environment variables (Development) run: | diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d3758366cf..7f30b5b05b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -114,7 +114,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 17 architecture: ${{ matrix.architecture }} - name: Import Developer ID Certificate @@ -173,7 +173,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 17 - name: Set release environment variable run: echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV @@ -235,7 +235,7 @@ jobs: github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) with: - distribution: 'zulu' + distribution: 'temurin' java-version: 17 - name: Combine (Main) if: | diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index b749a50492..2ab0d1cffc 100644 --- a/.github/workflows/lint-format.yml +++ b/.github/workflows/lint-format.yml @@ -107,7 +107,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 17 - name: Build with Gradle run: ./gradlew docs:zipDocs -PbuildServer -PdocWarningsAsErrors ${{ env.EXTRA_GRADLE_ARGS }}