Skip to content

Commit

Permalink
Pin some runner images (#9717)
Browse files Browse the repository at this point in the history
For the larger test/build jobs use some variables in the `*.js` files
calculating the matrix to pin the images to fixed versions of GitHub
actions images. For the `main.yml` file instead of changing everything
over to a pin only do the ones that are currently failing on the
`ubuntu-24.04` update. The hope is that there's only a few locations to
update pinned versions in the future, and we'll need to keep an eye on
CI warnings and such to know when to update these pins in the future.
  • Loading branch information
alexcrichton authored Dec 4, 2024
1 parent 30ff4bf commit 8df32f7
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# Note that `wasmtime-platform.h` is excluded here as it's auto-generated.
clangformat:
name: Clang format
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # FIXME: fails on `ubuntu-24.04` right now
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -847,7 +847,7 @@ jobs:
needs: determine
if: needs.determine.outputs.run-dwarf
name: Test DWARF debugging
runs-on: 'ubuntu-latest'
runs-on: ubuntu-22.04 # FIXME: fails on `ubuntu-24.04` right now
steps:
- uses: actions/checkout@v4
with:
Expand Down
28 changes: 16 additions & 12 deletions ci/build-build-matrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,69 +4,73 @@
// This is a separate script primarily to write out all the release
// targets/platforms once and then duplicate them all with a "min" build.

const ubuntu = 'ubuntu-22.04';
const windows = 'windows-2022';
const macos = 'macos-14';

const array = [
{
// The name of the build which shows up in the name of the artifact for
// Wasmtime's github releases.
"build": "x86_64-linux",
// The GitHub Actions platform that this build runs on
"os": "ubuntu-latest",
"os": ubuntu,
// The Rust target that will be used for the build.
"target": "x86_64-unknown-linux-gnu",
},
{
"build": "aarch64-linux",
"os": "ubuntu-latest",
"os": ubuntu,
"target": "aarch64-unknown-linux-gnu",
},
{
"build": "s390x-linux",
"os": "ubuntu-latest",
"os": ubuntu,
"target": "s390x-unknown-linux-gnu",
},
{
"build": "riscv64gc-linux",
"os": "ubuntu-latest",
"os": ubuntu,
"target": "riscv64gc-unknown-linux-gnu",
},
{
"build": "x86_64-macos",
"os": "macos-latest",
"os": macos,
"target": "x86_64-apple-darwin",
},
{
"build": "aarch64-macos",
"os": "macos-latest",
"os": macos,
"target": "aarch64-apple-darwin",
},
{
"build": "x86_64-windows",
"os": "windows-latest",
"os": windows,
"target": "x86_64-pc-windows-msvc",
},
{
"build": "x86_64-mingw",
"os": "windows-latest",
"os": windows,
"target": "x86_64-pc-windows-gnu",
},
{
"build": "aarch64-android",
"os": "ubuntu-latest",
"os": ubuntu,
"target": "aarch64-linux-android",
},
{
"build": "x86_64-android",
"os": "ubuntu-latest",
"os": ubuntu,
"target": "x86_64-linux-android",
},
{
"build": "x86_64-musl",
"os": "ubuntu-latest",
"os": ubuntu,
"target": "x86_64-unknown-linux-musl",
},
{
"build": "aarch64-windows",
"os": "windows-latest",
"os": windows,
"target": "aarch64-pc-windows-msvc",
},
];
Expand Down
26 changes: 15 additions & 11 deletions ci/build-test-matrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ const GENERIC_BUCKETS = 3;
// compile-and-test crates.
const SINGLE_CRATE_BUCKETS = ["wasmtime", "wasmtime-cli", "wasmtime-wasi"];

const ubuntu = 'ubuntu-22.04';
const windows = 'windows-2022';
const macos = 'macos-14';

// This is the small, fast-to-execute matrix we use for PRs before they enter
// the merge queue. Same schema as `FULL_MATRIX`.
const FAST_MATRIX = [
{
"os": "ubuntu-latest",
"os": ubuntu,
"name": "Test Linux x86_64",
"filter": "linux-x64",
"isa": "x64",
Expand Down Expand Up @@ -64,14 +68,14 @@ function supports32Bit(pkg) {
const FULL_MATRIX = [
...FAST_MATRIX,
{
"os": "ubuntu-latest",
"os": ubuntu,
"name": "Test MSRV on Linux x86_64",
"filter": "linux-x64",
"isa": "x64",
"rust": "msrv",
},
{
"os": "ubuntu-latest",
"os": ubuntu,
"name": "Test Linux x86_64 with MPK",
"filter": "linux-x64",
"isa": "x64"
Expand All @@ -82,24 +86,24 @@ const FULL_MATRIX = [
"filter": "macos-x64",
},
{
"os": "macos-14",
"os": macos,
"name": "Test macOS arm64",
"filter": "macos-arm64",
"target": "aarch64-apple-darwin",
},
{
"os": "windows-latest",
"os": windows,
"name": "Test Windows MSVC x86_64",
"filter": "windows-x64",
},
{
"os": "windows-latest",
"os": windows,
"target": "x86_64-pc-windows-gnu",
"name": "Test Windows MinGW x86_64",
"filter": "mingw-x64"
},
{
"os": "ubuntu-latest",
"os": ubuntu,
"target": "aarch64-unknown-linux-gnu",
"gcc_package": "gcc-aarch64-linux-gnu",
"gcc": "aarch64-linux-gnu-gcc",
Expand All @@ -110,7 +114,7 @@ const FULL_MATRIX = [
"isa": "aarch64",
},
{
"os": "ubuntu-latest",
"os": ubuntu,
"target": "s390x-unknown-linux-gnu",
"gcc_package": "gcc-s390x-linux-gnu",
"gcc": "s390x-linux-gnu-gcc",
Expand All @@ -121,7 +125,7 @@ const FULL_MATRIX = [
"isa": "s390x"
},
{
"os": "ubuntu-latest",
"os": ubuntu,
"target": "riscv64gc-unknown-linux-gnu",
"gcc_package": "gcc-riscv64-linux-gnu",
"gcc": "riscv64-linux-gnu-gcc",
Expand All @@ -134,15 +138,15 @@ const FULL_MATRIX = [
{
"name": "Tests on i686-unknown-linux-gnu",
"32-bit": true,
"os": "ubuntu-latest",
"os": ubuntu,
"target": "i686-unknown-linux-gnu",
"gcc_package": "gcc-i686-linux-gnu",
"gcc": "i686-linux-gnu-gcc",
},
{
"name": "Tests on armv7-unknown-linux-gnueabihf",
"32-bit": true,
"os": "ubuntu-latest",
"os": ubuntu,
"target": "armv7-unknown-linux-gnueabihf",
"gcc_package": "gcc-arm-linux-gnueabihf",
"gcc": "arm-linux-gnueabihf-gcc",
Expand Down

0 comments on commit 8df32f7

Please sign in to comment.