diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 241c895c4..ac0e11e01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,21 +14,43 @@ concurrency: jobs: test: - name: test ${{ matrix.rust }} ${{ matrix.flags }} - runs-on: ubuntu-latest + name: test ${{ matrix.os }} ${{ matrix.rust }} ${{ matrix.flags }} + runs-on: ${{ matrix.os }} timeout-minutes: 30 strategy: fail-fast: false matrix: - rust: ["stable", "beta", "nightly"] - flags: ["--no-default-features", "", "--all-features"] + os: ["ubuntu-latest", "windows-latest"] + rust: [ + "stable", + "beta", + "nightly", + "1.65" # MSRV + ] + flags: [ + # No features + "--no-default-features", + # Default features + "" + ] include: - - rust: "1.65" # MSRV - flags: "--no-default-features" - - rust: "1.65" # MSRV - flags: "" - - rust: "1.65" # MSRV + # MSRV features + - os: "ubuntu-latest" + rust: "1.65" # MSRV + flags: "--features json" + - os: "windows-latest" + rust: "1.65" # MSRV flags: "--features json" + # All features + - os: "ubuntu-latest" + rust: "stable" + flags: "--all-features" + - os: "ubuntu-latest" + rust: "beta" + flags: "--all-features" + - os: "ubuntu-latest" + rust: "nightly" + flags: "--all-features" steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master @@ -125,4 +147,4 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: components: rustfmt - - run: cargo fmt --all --check + - run: cargo fmt --all --check \ No newline at end of file diff --git a/crates/sol-types/tests/compiletest.rs b/crates/sol-types/tests/compiletest.rs index fc9e85dc0..d556d57b9 100644 --- a/crates/sol-types/tests/compiletest.rs +++ b/crates/sol-types/tests/compiletest.rs @@ -1,5 +1,5 @@ #[rustversion::attr(not(nightly), ignore)] -#[cfg_attr(miri, ignore)] +#[cfg_attr(any(target_os = "windows", miri), ignore)] #[test] fn ui() { let t = trybuild::TestCases::new();