Skip to content

Commit 06103f7

Browse files
authored
Update build/test images to Ubuntu 24.04 (#9728)
Manually updating some images after the pinning in #9717. There's a few more images after this but this should be the lion's share of the update. prtest:full
1 parent f0a15de commit 06103f7

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ jobs:
690690
set -ex
691691
692692
sudo apt-get update
693-
sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build
693+
sudo apt-get install -y ${{ matrix.gcc_package }}
694694
695695
# Configure Cargo for cross compilation and tell it how it can run
696696
# cross executables
@@ -723,6 +723,9 @@ jobs:
723723
exit 0
724724
fi
725725
726+
# Install build dependencies of QEMU itself.
727+
sudo apt-get install -y libglib2.0-dev ninja-build
728+
726729
# Download and build qemu from source since the most recent release is
727730
# way faster at arm emulation than the current version github actions'
728731
# ubuntu image uses. Disable as much as we can to get it to build

ci/build-build-matrix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// This is a separate script primarily to write out all the release
55
// targets/platforms once and then duplicate them all with a "min" build.
66

7-
const ubuntu = 'ubuntu-22.04';
7+
const ubuntu = 'ubuntu-24.04';
88
const windows = 'windows-2022';
99
const macos = 'macos-14';
1010

ci/build-test-matrix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const GENERIC_BUCKETS = 3;
1515
// compile-and-test crates.
1616
const SINGLE_CRATE_BUCKETS = ["wasmtime", "wasmtime-cli", "wasmtime-wasi"];
1717

18-
const ubuntu = 'ubuntu-22.04';
18+
const ubuntu = 'ubuntu-24.04';
1919
const windows = 'windows-2022';
2020
const macos = 'macos-14';
2121

0 commit comments

Comments
 (0)