From 9445e421c62cd79f9e88a91976b1933305fc7515 Mon Sep 17 00:00:00 2001 From: donoghuc Date: Tue, 27 Jan 2026 14:34:25 -0800 Subject: [PATCH 1/2] Ensure all JDK are available before raising java bump PR Previously a PR was raised when a new java version was detected for the default x86_64 linux artifact. In practice, other platforms become available later than the default. This commit updates updatecli to only raise a PR once all artifacts are ready. --- .ci/updatecli/bump-java-version.yml | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.ci/updatecli/bump-java-version.yml b/.ci/updatecli/bump-java-version.yml index d454f83439..5350fa0687 100644 --- a/.ci/updatecli/bump-java-version.yml +++ b/.ci/updatecli/bump-java-version.yml @@ -48,6 +48,41 @@ sources: file: 'https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_{{ source "jdk_major" }}_linux' key: 'revision' +conditions: + # Verify all platform builds are available before raising a PR + # The source checks linux-x86_64, these conditions check remaining platforms + linux_aarch64_available: + name: "Check linux-aarch64 JDK is available" + kind: json + disablesourceinput: true + spec: + file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-linux-aarch64' + key: 'url' + + darwin_x86_64_available: + name: "Check darwin-x86_64 JDK is available" + kind: json + disablesourceinput: true + spec: + file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-darwin' + key: 'url' + + darwin_aarch64_available: + name: "Check darwin-aarch64 JDK is available" + kind: json + disablesourceinput: true + spec: + file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-darwin-aarch64' + key: 'url' + + windows_x86_64_available: + name: "Check windows-x86_64 JDK is available" + kind: json + disablesourceinput: true + spec: + file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-windows' + key: 'url' + targets: update_jdk_revision: name: "Update JDK revision" From 4ba7153c34290b20e8324e9d9bac017306685dfc Mon Sep 17 00:00:00 2001 From: donoghuc Date: Tue, 27 Jan 2026 14:52:40 -0800 Subject: [PATCH 2/2] use curl instead --- .ci/updatecli/bump-java-version.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.ci/updatecli/bump-java-version.yml b/.ci/updatecli/bump-java-version.yml index 5350fa0687..19e82ff81a 100644 --- a/.ci/updatecli/bump-java-version.yml +++ b/.ci/updatecli/bump-java-version.yml @@ -53,35 +53,31 @@ conditions: # The source checks linux-x86_64, these conditions check remaining platforms linux_aarch64_available: name: "Check linux-aarch64 JDK is available" - kind: json + kind: shell disablesourceinput: true spec: - file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-linux-aarch64' - key: 'url' + command: curl --silent --fail --head 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-linux-aarch64' darwin_x86_64_available: name: "Check darwin-x86_64 JDK is available" - kind: json + kind: shell disablesourceinput: true spec: - file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-darwin' - key: 'url' + command: curl --silent --fail --head 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-darwin' darwin_aarch64_available: name: "Check darwin-aarch64 JDK is available" - kind: json + kind: shell disablesourceinput: true spec: - file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-darwin-aarch64' - key: 'url' + command: curl --silent --fail --head 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-darwin-aarch64' windows_x86_64_available: name: "Check windows-x86_64 JDK is available" - kind: json + kind: shell disablesourceinput: true spec: - file: 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-windows' - key: 'url' + command: curl --silent --fail --head 'https://jvm-catalog.elastic.co/jdk/adoptiumjdk-{{ source "latest_jdk_version" }}+{{ source "latest_jdk_build" }}-windows' targets: update_jdk_revision: