Skip to content

Commit c0d6c4a

Browse files
authored
Merge pull request #6 from oxidecomputer/wc/default-runner
Update default runner to Ubuntu 24.04
2 parents 8f04962 + 2e58011 commit c0d6c4a

File tree

56 files changed

+257
-276
lines changed

Some content is hidden

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

56 files changed

+257
-276
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ pub fn runner_to_config(runner: &GithubRunnerRef) -> GithubRunnerConfig {
638638
}
639639
}
640640

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

643643
fn default_global_runner_config() -> GithubRunnerConfig {
644644
runner_to_config(DEFAULT_LINUX_RUNNER)
@@ -659,7 +659,7 @@ 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-20.04")),
662+
OperatingSystem::Linux => runner_to_config(GithubRunnerRef::from_str("ubuntu-24.04")),
663663
OperatingSystem::Darwin => runner_to_config(GithubRunnerRef::from_str("macos-13")),
664664
OperatingSystem::Windows => {
665665
// Default to cargo-xwin for Windows cross-compiles
@@ -677,7 +677,7 @@ fn github_runner_for_target(
677677

678678
fn cargo_xwin() -> GithubRunnerConfig {
679679
GithubRunnerConfig {
680-
runner: GithubRunnerRef::from_str("ubuntu-20.04").to_owned(),
680+
runner: GithubRunnerRef::from_str("ubuntu-24.04").to_owned(),
681681
host: targets::TARGET_X64_LINUX_GNU.to_owned(),
682682
container: Some(dist_schema::ContainerConfig {
683683
image: ContainerImageRef::from_str("messense/cargo-xwin").to_owned(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl ApplyLayer for GithubCiConfig {
7171
) {
7272
self.common.apply_layer(common);
7373

74-
let mk_default_github_runner = || GithubRunner::new("ubuntu-20.04".to_owned());
74+
let mk_default_github_runner = || GithubRunner::new("ubuntu-24.04".to_owned());
7575
self.runners.apply_val(runners.map(|runners| {
7676
runners
7777
.into_iter()

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

Lines changed: 6 additions & 6 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: 6 additions & 6 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: 6 additions & 6 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: 6 additions & 6 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: 6 additions & 6 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: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)