Skip to content

Commit 462de6b

Browse files
committed
Convert to workspace
1 parent 5f93ff7 commit 462de6b

13 files changed

Lines changed: 272 additions & 493 deletions

File tree

.github/workflows/ci.yml

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
pull_request:
77
branches: [master]
88

9-
env:
10-
CARGO_TERM_COLOR: always
11-
129
jobs:
1310
test:
1411
name: Test (${{ matrix.rust }})
@@ -19,88 +16,72 @@ jobs:
1916
rust: [stable, beta, nightly]
2017
steps:
2118
- uses: actions/checkout@v4
22-
19+
2320
- name: Install Rust ${{ matrix.rust }}
2421
uses: dtolnay/rust-toolchain@master
2522
with:
2623
toolchain: ${{ matrix.rust }}
27-
24+
2825
- name: Cache dependencies
2926
uses: Swatinem/rust-cache@v2
30-
with:
31-
workspaces: |
32-
jmespath
33-
jmespath-cli
34-
35-
- name: Build jmespath
36-
run: cargo build --manifest-path jmespath/Cargo.toml
37-
27+
28+
- name: Check jmespath
29+
run: cargo check
30+
3831
- name: Test jmespath
39-
run: cargo test --manifest-path jmespath/Cargo.toml
40-
32+
run: cargo test
33+
4134
- name: Test jmespath with specialized feature (nightly only)
4235
if: matrix.rust == 'nightly'
43-
run: cargo test --manifest-path jmespath/Cargo.toml --features specialized
44-
45-
- name: Build jmespath-cli
46-
run: cargo build --manifest-path jmespath-cli/Cargo.toml
47-
48-
- name: Test jmespath-cli
49-
run: cargo test --manifest-path jmespath-cli/Cargo.toml
36+
run: cargo +nightly test --features specialized
5037

5138
clippy:
5239
name: Clippy
5340
runs-on: ubuntu-latest
5441
steps:
5542
- uses: actions/checkout@v4
56-
43+
5744
- name: Install Rust stable
5845
uses: dtolnay/rust-toolchain@stable
5946
with:
6047
components: clippy
61-
48+
6249
- name: Cache dependencies
6350
uses: Swatinem/rust-cache@v2
64-
with:
65-
workspaces: |
66-
jmespath
67-
jmespath-cli
68-
51+
6952
- name: Run clippy on jmespath
70-
run: cargo clippy --manifest-path jmespath/Cargo.toml -- -D warnings
71-
53+
run: cargo clippy -- -D warnings
54+
7255
- name: Run clippy on jmespath-cli
73-
run: cargo clippy --manifest-path jmespath-cli/Cargo.toml -- -D warnings
56+
run: cargo clippy -- -D warnings
7457

7558
fmt:
7659
name: Rustfmt
7760
runs-on: ubuntu-latest
7861
steps:
7962
- uses: actions/checkout@v4
80-
63+
8164
- name: Install Rust stable
8265
uses: dtolnay/rust-toolchain@stable
8366
with:
8467
components: rustfmt
85-
68+
8669
- name: Check formatting
87-
run: |
88-
cargo fmt --manifest-path jmespath/Cargo.toml -- --check
89-
cargo fmt --manifest-path jmespath-cli/Cargo.toml -- --check
70+
run: cargo fmt -- --check
9071

9172
bench:
9273
name: Benchmarks
9374
runs-on: ubuntu-latest
9475
steps:
9576
- uses: actions/checkout@v4
96-
77+
9778
- name: Install Rust nightly
9879
uses: dtolnay/rust-toolchain@nightly
99-
80+
10081
- name: Cache dependencies
10182
uses: Swatinem/rust-cache@v2
10283
with:
10384
workspaces: jmespath
104-
85+
10586
- name: Run benchmarks
106-
run: cargo bench --manifest-path jmespath/Cargo.toml --no-run
87+
run: cargo bench

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
**/target
2-
jmespath/Cargo.lock
3-
.idea/**
2+
Cargo.lock
3+
.idea/**

.travis.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 0.5.0 - 2026-01-20
4+
5+
* Moved to a Cargo workspace
6+
* Added `interpret` as a public function: https://github.com/jmespath/jmespath.rs/pull/60
7+
38
## 0.4.0 - 2025-07-10
49

510
* Upgrade to Rust 2024 edition

Cargo.toml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[workspace]
2+
members = [
3+
"jmespath",
4+
"jmespath-cli",
5+
]
6+
resolver = "2"
7+
8+
[workspace.package]
9+
edition = "2024"
10+
11+
[workspace.dependencies]
12+
serde = { version = "1", features = ["rc"] }
13+
serde_json = "1"

jmespath-cli/Cargo.lock

Lines changed: 0 additions & 171 deletions
This file was deleted.

0 commit comments

Comments
 (0)