Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 22 additions & 41 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
pull_request:
branches: [master]

env:
CARGO_TERM_COLOR: always

jobs:
test:
name: Test (${{ matrix.rust }})
Expand All @@ -19,88 +16,72 @@ jobs:
rust: [stable, beta, nightly]
steps:
- uses: actions/checkout@v4

- name: Install Rust ${{ matrix.rust }}
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}

- name: Cache dependencies
uses: Swatinem/rust-cache@v2
with:
workspaces: |
jmespath
jmespath-cli

- name: Build jmespath
run: cargo build --manifest-path jmespath/Cargo.toml


- name: Check jmespath
run: cargo check

- name: Test jmespath
run: cargo test --manifest-path jmespath/Cargo.toml
run: cargo test

- name: Test jmespath with specialized feature (nightly only)
if: matrix.rust == 'nightly'
run: cargo test --manifest-path jmespath/Cargo.toml --features specialized

- name: Build jmespath-cli
run: cargo build --manifest-path jmespath-cli/Cargo.toml

- name: Test jmespath-cli
run: cargo test --manifest-path jmespath-cli/Cargo.toml
run: cargo +nightly test --features specialized

clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
components: clippy

- name: Cache dependencies
uses: Swatinem/rust-cache@v2
with:
workspaces: |
jmespath
jmespath-cli


- name: Run clippy on jmespath
run: cargo clippy --manifest-path jmespath/Cargo.toml -- -D warnings
run: cargo clippy -- -D warnings

- name: Run clippy on jmespath-cli
run: cargo clippy --manifest-path jmespath-cli/Cargo.toml -- -D warnings
run: cargo clippy -- -D warnings

fmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt

- name: Check formatting
run: |
cargo fmt --manifest-path jmespath/Cargo.toml -- --check
cargo fmt --manifest-path jmespath-cli/Cargo.toml -- --check
run: cargo fmt -- --check

bench:
name: Benchmarks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install Rust nightly
uses: dtolnay/rust-toolchain@nightly

- name: Cache dependencies
uses: Swatinem/rust-cache@v2
with:
workspaces: jmespath

- name: Run benchmarks
run: cargo bench --manifest-path jmespath/Cargo.toml --no-run
run: cargo bench
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**/target
jmespath/Cargo.lock
.idea/**
Cargo.lock
.idea/**
47 changes: 0 additions & 47 deletions .travis.yml

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 0.5.0 - 2026-01-20

* Moved to a Cargo workspace
* Added `interpret` as a public function: https://github.com/jmespath/jmespath.rs/pull/60

## 0.4.0 - 2025-07-10

* Upgrade to Rust 2024 edition
Expand Down
13 changes: 13 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[workspace]
members = [
"jmespath",
"jmespath-cli",
]
resolver = "2"

[workspace.package]
edition = "2024"

[workspace.dependencies]
serde = { version = "1", features = ["rc"] }
serde_json = "1"
171 changes: 0 additions & 171 deletions jmespath-cli/Cargo.lock

This file was deleted.

Loading