Skip to content

Commit c8b72a2

Browse files
committed
Remove windows-2019, set ubuntu-22.04 as default
The `windows-2019` GH runner will be removed at the end of this month, remove it as an option and set the default Windows x86_64 runner to `windows-2022`. Also move the default Linux runner down to `ubuntu-22.04` to minimize the churn in bundled dependencies.
1 parent 78296ff commit c8b72a2

54 files changed

Lines changed: 107 additions & 110 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

β€Žcargo-dist/src/backend/ci/github.rsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,14 +659,14 @@ fn github_runner_for_target(
659659
// where random system dependencies can creep in and be very
660660
// recent. This helps with portability!
661661
let result = Some(match target_triple.operating_system {
662-
OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-24.04")),
662+
OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-22.04")),
663663
OperatingSystem::Darwin => runner_to_config(GithubRunnerRef::from_str("macos-13")),
664664
OperatingSystem::Windows => {
665665
// Default to cargo-xwin for Windows cross-compiles
666666
if target_triple.architecture != Architecture::X86_64 {
667667
cargo_xwin()
668668
} else {
669-
runner_to_config(GithubRunnerRef::from_str("windows-2019"))
669+
runner_to_config(GithubRunnerRef::from_str("windows-2022"))
670670
}
671671
}
672672
_ => return Ok(None),

β€Žcargo-dist/src/platform/github_runners.rsβ€Ž

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,16 @@ lazy_static::lazy_static! {
1313
// last updated 2024-10-25
1414

1515
//-------- linux
16-
m.insert(GithubRunnerRef::from_str("ubuntu-20.04"), t::TARGET_X64_LINUX_GNU);
1716
m.insert(GithubRunnerRef::from_str("ubuntu-22.04"), t::TARGET_X64_LINUX_GNU);
1817
m.insert(GithubRunnerRef::from_str("ubuntu-24.04"), t::TARGET_X64_LINUX_GNU);
1918
m.insert(GithubRunnerRef::from_str("ubuntu-latest"), t::TARGET_X64_LINUX_GNU);
2019

2120
//-------- windows
22-
m.insert(GithubRunnerRef::from_str("windows-2019"), t::TARGET_X64_WINDOWS);
2321
m.insert(GithubRunnerRef::from_str("windows-2022"), t::TARGET_X64_WINDOWS);
22+
m.insert(GithubRunnerRef::from_str("windows-2025"), t::TARGET_X64_WINDOWS);
2423
m.insert(GithubRunnerRef::from_str("windows-latest"), t::TARGET_X64_WINDOWS);
2524

2625
//-------- macos x64
27-
m.insert(GithubRunnerRef::from_str("macos-12"), t::TARGET_X64_MAC); // deprecated
28-
m.insert(GithubRunnerRef::from_str("macos-12-large"), t::TARGET_X64_MAC);
2926
m.insert(GithubRunnerRef::from_str("macos-13"), t::TARGET_X64_MAC);
3027
m.insert(GithubRunnerRef::from_str("macos-13-large"), t::TARGET_X64_MAC);
3128
m.insert(GithubRunnerRef::from_str("macos-14-large"), t::TARGET_X64_MAC);
@@ -91,7 +88,7 @@ mod tests {
9188
#[test]
9289
fn test_target_for_github_runner() {
9390
assert_eq!(
94-
target_for_github_runner(GithubRunnerRef::from_str("ubuntu-20.04")),
91+
target_for_github_runner(GithubRunnerRef::from_str("ubuntu-22.04")),
9592
Some(t::TARGET_X64_LINUX_GNU)
9693
);
9794
assert_eq!(

β€Žcargo-dist/tests/snapshots/akaikatana_basic.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_musl.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/akaikatana_updaters.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/axolotlsay_abyss.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/axolotlsay_alias.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snapβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)