From b0881a6ba082613fbf7f4131acde9be9a0591c51 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 13 Nov 2025 10:57:21 -0600 Subject: [PATCH 1/3] chore(ci): Give more control over where alt version jobs run --- .github/workflows/ci.yml | 10 ++++++++-- .github/workflows/rust-next.yml | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1b1078d..faf37f9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,10 @@ jobs: run: cargo hack test --each-feature --workspace msrv: name: "Check MSRV" - runs-on: ubuntu-latest + strategy: + matrix: + os: ["ubuntu-latest"] + runs-on: ${{ matrix.os }} steps: - name: Checkout repository uses: actions/checkout@v5 @@ -70,7 +73,10 @@ jobs: run: cargo hack check --each-feature --locked --rust-version --ignore-private --workspace --all-targets --keep-going minimal-versions: name: Minimal versions - runs-on: ubuntu-latest + strategy: + matrix: + os: ["ubuntu-latest"] + runs-on: ${{ matrix.os }} steps: - name: Checkout repository uses: actions/checkout@v5 diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index c2e993a1..3eccec92 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -46,7 +46,10 @@ jobs: run: cargo hack test --each-feature --workspace latest: name: "Check latest dependencies" - runs-on: ubuntu-latest + strategy: + matrix: + os: ["ubuntu-latest"] + runs-on: ${{ matrix.os }} env: CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: allow steps: From 21b13fa224c4bcd7559561ee2a18a47f46a03cfd Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 13 Nov 2025 10:59:02 -0600 Subject: [PATCH 2/3] chore(ci): Run more jobs on Windows --- .github/workflows/ci.yml | 2 +- .github/workflows/rust-next.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c8f93a0..cf28bd3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: name: Minimal versions strategy: matrix: - os: ["ubuntu-latest"] + os: ["ubuntu-latest", "windows-latest"] runs-on: ${{ matrix.os }} steps: - name: Checkout repository diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index c5c1cdfc..b9c3fb36 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -49,7 +49,7 @@ jobs: name: "Check latest dependencies" strategy: matrix: - os: ["ubuntu-latest"] + os: ["ubuntu-latest", "windows-latest"] runs-on: ${{ matrix.os }} env: CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: allow From 5b1cab43bc65b186a06dd28bac63592b623b5765 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 13 Nov 2025 11:16:47 -0600 Subject: [PATCH 3/3] fix(syntect): Update a windows minimal dep --- Cargo.lock | 1 + crates/anstyle-syntect/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 1387875c..8dd26d33 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,6 +185,7 @@ name = "anstyle-syntect" version = "1.0.4" dependencies = [ "anstyle 1.0.13", + "same-file", "syntect", "thiserror", ] diff --git a/crates/anstyle-syntect/Cargo.toml b/crates/anstyle-syntect/Cargo.toml index 0be6ff3b..37498b08 100644 --- a/crates/anstyle-syntect/Cargo.toml +++ b/crates/anstyle-syntect/Cargo.toml @@ -29,6 +29,7 @@ syntect = { version = "5.2.0", default-features = false } [target.'cfg(any())'.dependencies] thiserror = "1.0.2" # HACK: bad minimal dep in syntect +same-file = "1.0.6" # HACK: bad mininal dep somewhere [lints] workspace = true