From 110c4ac19cc98d962955f9141fd3b77ac3397046 Mon Sep 17 00:00:00 2001 From: Leon Linhart Date: Fri, 28 Feb 2025 18:12:09 +0100 Subject: [PATCH] build: centralize Java version used for CI --- .github/workflows/.java-version | 1 + .github/workflows/ci.yaml | 5 ++--- .github/workflows/publish.yaml | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/.java-version diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version new file mode 100644 index 0000000..b393560 --- /dev/null +++ b/.github/workflows/.java-version @@ -0,0 +1 @@ +23 \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5b3e46f..077637c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,7 +6,6 @@ on: env: - JDK_VERSION: "21" WORKSPACE_ARCHIVE: workspace.tar WORKSPACE_ARTIFACT: build-results @@ -23,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: ${{ env.JDK_VERSION }} + java-version-file: .github/workflows/.java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -97,7 +96,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: ${{ env.JDK_VERSION }} + java-version-file: .github/workflows/.java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 134fcda..ea96399 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,7 +13,6 @@ concurrency: env: - JDK_VERSION: "21" DOCS_BUNDLE: docs.bundle DOCS_BUNDLE_ARTIFACT: docs-bundle WORKSPACE_ARCHIVE: workspace.tar @@ -32,7 +31,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: ${{ env.JDK_VERSION }} + java-version-file: .github/workflows/.java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -70,7 +69,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: ${{ env.JDK_VERSION }} + java-version-file: .github/workflows/.java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -200,7 +199,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: ${{ env.JDK_VERSION }} + java-version-file: .github/workflows/.java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@v4