Skip to content
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
6 changes: 3 additions & 3 deletions cargo-dist/src/backend/ci/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ pub fn runner_to_config(runner: &GithubRunnerRef) -> GithubRunnerConfig {
}
}

const DEFAULT_LINUX_RUNNER: &GithubRunnerRef = GithubRunnerRef::from_str("ubuntu-20.04");
const DEFAULT_LINUX_RUNNER: &GithubRunnerRef = GithubRunnerRef::from_str("ubuntu-24.04");

fn default_global_runner_config() -> GithubRunnerConfig {
runner_to_config(DEFAULT_LINUX_RUNNER)
Expand All @@ -659,7 +659,7 @@ fn github_runner_for_target(
// where random system dependencies can creep in and be very
// recent. This helps with portability!
let result = Some(match target_triple.operating_system {
OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-20.04")),
OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-24.04")),
OperatingSystem::Darwin => runner_to_config(GithubRunnerRef::from_str("macos-13")),
OperatingSystem::Windows => {
// Default to cargo-xwin for Windows cross-compiles
Expand All @@ -677,7 +677,7 @@ fn github_runner_for_target(

fn cargo_xwin() -> GithubRunnerConfig {
GithubRunnerConfig {
runner: GithubRunnerRef::from_str("ubuntu-20.04").to_owned(),
runner: GithubRunnerRef::from_str("ubuntu-24.04").to_owned(),
host: targets::TARGET_X64_LINUX_GNU.to_owned(),
container: Some(dist_schema::ContainerConfig {
image: ContainerImageRef::from_str("messense/cargo-xwin").to_owned(),
Expand Down
2 changes: 1 addition & 1 deletion cargo-dist/src/config/v1/ci/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl ApplyLayer for GithubCiConfig {
) {
self.common.apply_layer(common);

let mk_default_github_runner = || GithubRunner::new("ubuntu-20.04".to_owned());
let mk_default_github_runner = || GithubRunner::new("ubuntu-24.04".to_owned());
self.runners.apply_val(runners.map(|runners| {
runners
.into_iter()
Expand Down
12 changes: 6 additions & 6 deletions cargo-dist/tests/snapshots/akaikatana_basic.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions cargo-dist/tests/snapshots/akaikatana_musl.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions cargo-dist/tests/snapshots/akaikatana_updaters.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions cargo-dist/tests/snapshots/axolotlsay_abyss.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading