From a1174c06e5d67e2d9b339c0d801f8dff238bb325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Thu, 27 Feb 2025 13:45:51 +0100 Subject: [PATCH 1/2] Extract Java version in workflows into a dedicated file --- .github/renovate.json | 14 ++++++++++++++ .github/workflows/.java-version | 1 + .github/workflows/quality.yml | 10 +++++----- .github/workflows/release.yml | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/.java-version diff --git a/.github/renovate.json b/.github/renovate.json index 5db72dd..20fc29f 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,5 +2,19 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended" + ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + "\\.java-version$" + ], + "matchStrings": [ + "(?.*)\\n" + ], + "datasourceTemplate": "java-version", + "depNameTemplate": "java", + "extractVersionTemplate": "^(?\\d+)" + } ] } diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version new file mode 100644 index 0000000..98d9bcb --- /dev/null +++ b/.github/workflows/.java-version @@ -0,0 +1 @@ +17 diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 1dc7731..da61797 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -45,7 +45,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -69,7 +69,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -144,7 +144,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -162,7 +162,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 476bde9..030ff9e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Publish to GitHub Packages run: ./gradlew publish From 9c8adcfd6e60fabaae19c463b23edfc343d0abfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Wed, 5 Mar 2025 15:35:24 +0100 Subject: [PATCH 2/2] Use `java-version-file` for Screenshot Tests --- .github/workflows/quality.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index da61797..7bdcc61 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -105,8 +105,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v4 with: - # TODO use java-version-file when the corresponding PR is merged - java-version: '17' + java-version-file: .github/workflows/.java-version distribution: 'temurin' - name: Set up Gradle uses: gradle/actions/setup-gradle@v4