diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml index 620e0a8f639..50f69d1b6f6 100644 --- a/.github/workflows/deployment-jdk-ea.yml +++ b/.github/workflows/deployment-jdk-ea.yml @@ -9,6 +9,7 @@ on: pull_request: paths: - .github/workflows/deployment-jdk-ea.yml + - build.gradle workflow_dispatch: inputs: notarization: @@ -37,8 +38,8 @@ jobs: steps: - id: javafx_versions run: | - curl -s "https://search.maven.org/solrsearch/select?q=g:org.openjfx+AND+a:javafx&rows=5&core=gav" > /tmp/versions.json - jq '[.response.docs[] | select(.v | test(".*-ea\\+.*")) | select(.v | test("^17") | not) | {version: .v}] | group_by(.version | capture("^(?\\d+).*").major) | map(max_by(.version))' < /tmp/versions.json > /tmp/versions-latest.json + curl -s "https://search.maven.org/solrsearch/select?q=g:org.openjfx+AND+a:javafx&rows=10&core=gav" > /tmp/versions.json + jq '[.response.docs[] | select(.v | test(".*-ea\\+.*")) | select(.v | test("^17|^18|^19|^20|^21|^22") | not) | {version: .v}] | group_by(.version | capture("^(?\\d+).*").major) | map(max_by(.version))' < /tmp/versions.json > /tmp/versions-latest.json versions_json=$(jq -r '[.[].version]' /tmp/versions-latest.json | jq -r tostring) include_json=$(jq -n '[ {"os": "ubuntu-latest", "displayName": "linux", "archivePortable": "tar -c -C build/distribution JabRef | pigz --rsyncable > build/distribution/JabRef-portable_linux.tar.gz && rm -R build/distribution/JabRef"}, @@ -49,7 +50,7 @@ jobs: matrix=$(jq -n \ --argjson versionsContent "$versions_json" \ --argjson includeContent "$include_json" \ - '{"os": ["ubuntu-latest", "windows-latest", "macos-latest", "buildjet-4vcpu-ubuntu-2204-arm"], "jdk": [22, 23], "javafx": $versionsContent, "include": $includeContent}') + '{"os": ["ubuntu-latest", "windows-latest", "macos-latest", "buildjet-4vcpu-ubuntu-2204-arm"], "jdk": [23], "javafx": $versionsContent, "include": $includeContent}') echo matrix=$matrix >> $GITHUB_OUTPUT build: needs: setup-matrix diff --git a/build.gradle b/build.gradle index ee8da66bb8a..1165b0e8d6b 100644 --- a/build.gradle +++ b/build.gradle @@ -49,8 +49,9 @@ java { toolchain { // If this is updated, also update - // - .devcontainer/devcontainer.json#L34 and // - .gitpod.Dockerfile + // - .devcontainer/devcontainer.json#L34 and + // - .github/workflows/deployment-jdk-ea.yml#L53 languageVersion = JavaLanguageVersion.of(21) } }