Skip to content

Commit

Permalink
[GR-49982] CI: Only check labsjdk vs oraclejdk versions when actually…
Browse files Browse the repository at this point in the history
… using a labsjdk

PullRequest: graal/16168
  • Loading branch information
zapster authored and ntemmar committed Nov 24, 2023
2 parents 9805b1b + 8029a9b commit 4dade60
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ci/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ local common_json = import "../common.json";
local _oraclejdk = common_json.jdks["oraclejdk-latest"];
local _ov = "ee-%s+%s" % [_oraclejdk.version, _oraclejdk.build_id];
local _lv = _labsjdk.version;
assert std.startsWith(_lv, _ov) : "update oraclejdk-latest to match labsjdk-ee-latest: %s+%s vs %s" % [_oraclejdk.version, _oraclejdk.build_id, _labsjdk.version];
# Skip the check if we are not using a labsjdk. This can happen on JDK integration branches.
local no_labsjdk = _labsjdk.name != "labsjdk";
assert no_labsjdk || std.startsWith(_lv, _ov) : "update oraclejdk-latest to match labsjdk-ee-latest: %s+%s vs %s" % [_oraclejdk.version, _oraclejdk.build_id, _labsjdk.version];
true,

# The raw jdk data, the same as common_json.jdks + { jdk_version:: }
Expand Down

0 comments on commit 4dade60

Please sign in to comment.