Skip to content

Commit d68b6af

Browse files
committed
Run scarb 2.14.0 on ci
commit-id:7c262d66
1 parent ba95c4a commit d68b6af

File tree

2 files changed

+7
-9
lines changed
  • .github/workflows
  • crates/cairo-coverage/src/commands

2 files changed

+7
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
version: [ 2.9.4, 2.10.1, 2.11.4, 2.12.2, 2.13.1 ]
15+
version: [ 2.9.4, 2.10.1, 2.11.4, 2.12.2, 2.13.1, 2.14.0 ]
1616
steps:
1717
- uses: actions/checkout@v6
1818
- uses: dtolnay/rust-toolchain@stable
@@ -25,7 +25,7 @@ jobs:
2525
- run: cargo test --release
2626
if: matrix.version == '2.9.4' || matrix.version == '2.10.1'
2727
- run: cargo test --release --features allows-excluding-macros
28-
if: matrix.version == '2.11.4' || matrix.version == '2.12.2' || matrix.version == '2.13.1'
28+
if: matrix.version != '2.9.4' && matrix.version != '2.10.1'
2929

3030
rustfmt:
3131
name: Check rust formatting

crates/cairo-coverage/src/commands/run.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ pub fn run(
2020
) -> Result<()> {
2121
let metadata = scarb_metadata()?;
2222

23-
if !include.contains(&IncludedComponent::Macros) {
24-
ensure!(
25-
metadata.app_version_info.version <= Version::new(2, 8, 5)
26-
|| metadata.app_version_info.version >= Version::new(2, 11, 0),
27-
"excluding macros is only supported for Scarb versions <= 2.8.5 and >= 2.11.0"
28-
);
29-
}
23+
ensure!(
24+
include.contains(&IncludedComponent::Macros)
25+
|| metadata.app_version_info.version >= Version::new(2, 11, 0),
26+
"excluding macros is only supported for Scarb versions >= 2.11.0"
27+
);
3028

3129
let project_path = project_path.unwrap_or(metadata.workspace.root);
3230

0 commit comments

Comments
 (0)