Skip to content
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.

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

[xaprepare] update Debian dependencies for current unstable (trixie) #8169

Merged
merged 1 commit into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ class LinuxDebian : LinuxDebianCommon
new DebianLinuxProgram ("openjdk-8-jdk"),
};

static readonly List<DebianLinuxProgram> packagesPreTrixie = new List<DebianLinuxProgram> {
new DebianLinuxProgram ("libncurses5-dev"),
};

static readonly List<DebianLinuxProgram> packagesTrixieAndLater = new List<DebianLinuxProgram> {
new DebianLinuxProgram ("libncurses-dev"),
};

// zulu-8 does NOT exist as official Debian package! We need it for our bots, but we have to figure out what to
// do with Debian 10+ in general, as it does not contain OpenJDK 8 anymore and we require it to work.
static readonly List<DebianLinuxProgram> packages10AndNewerBuildBots = new List<DebianLinuxProgram> {
Expand Down Expand Up @@ -45,8 +53,26 @@ protected override void InitializeDependencies ()
if (DebianRelease.Major >= 10 || (IsTesting && String.Compare ("buster", CodeName, StringComparison.OrdinalIgnoreCase) == 0)) {
if (Context.IsRunningOnHostedAzureAgent)
Dependencies.AddRange (packages10AndNewerBuildBots);
} else
if (DebianRelease.Major >= 13) {
Dependencies.AddRange (packagesTrixieAndLater);
} else {
Dependencies.AddRange (packagesPreTrixie);
}
} else {
Dependencies.AddRange (packagesPre10);
Dependencies.AddRange (packagesPreTrixie);
}
}

static bool IsDebian13OrNewer (string? version)
{
if (String.IsNullOrEmpty (version)) {
return false;
}

return
version.IndexOf ("trixie", StringComparison.OrdinalIgnoreCase) >= 0 ||
version.IndexOf ("sid", StringComparison.OrdinalIgnoreCase) >= 0;
}

static bool IsDebian10OrNewer (string? version)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ abstract class LinuxDebianCommon : Linux
new DebianLinuxProgram ("g++-mingw-w64"),
new DebianLinuxProgram ("gcc-mingw-w64"),
new DebianLinuxProgram ("git"),
new DebianLinuxProgram ("libncurses5-dev"),
new DebianLinuxProgram ("libtool"),
new DebianLinuxProgram ("libz-mingw-w64-dev"),
new DebianLinuxProgram ("linux-libc-dev"),
Expand Down