Skip to content

[runners-flink] Use index-based version comparison in flink_runner.gradle #38272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Abacn merged 4 commits into from
Apr 24, 2026
+11 −4
Merged

[runners-flink] Use index-based version comparison in flink_runner.gradle #38272

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98c8bac
[runners-flink] Use index-based version comparison in flink_runner.gr…
tkaymak Apr 23, 2026
89cf8ee
Trigger Build
tkaymak Apr 23, 2026
9834e3d
[runners-flink] Address Gemini review on flink_runner.gradle
tkaymak Apr 23, 2026
054c4e3
Trigger Build
tkaymak Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions runners/flink/flink_runner.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,16 @@ def overrides(versions, type, base_path, group='java') {
["${base_path}/src/${type}/${group}"] + versions.collect { "${base_path}/${it}/src/${type}/${group}" } + ["./src/${type}/${group}"]
}

def all_versions = flink_versions.split(",")

def previous_versions = all_versions.findAll { it < flink_major }
def all_versions = flink_versions.split(",").collect { it.trim() }
// Determine version order by list position rather than string comparison so two-digit
// minors (e.g. "1.20") sort correctly relative to "1.18" / "1.19".
def flink_major_index = all_versions.indexOf(flink_major?.toString()?.trim())
if (flink_major_index < 0) {
throw new GradleException(
"flink_major='${flink_major}' is not listed in flink_versions='${flink_versions}' " +
"(see root gradle.properties).")
}
def previous_versions = all_versions.subList(0, flink_major_index)

// Version specific code overrides.
def main_source_overrides = overrides(previous_versions, "main", base_path)
Expand Down Expand Up @@ -106,7 +113,7 @@ def copyTestResourcesOverrides = tasks.register('copyTestResourcesOverrides', Co
it.duplicatesStrategy DuplicatesStrategy.INCLUDE
}

def use_override = (flink_major != all_versions.first())
def use_override = (flink_major_index > 0)
def sourceBase = "${project.projectDir}/../src"

if (use_override) {
Expand Down
Loading