Skip to content
Open
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
25 changes: 18 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,25 @@ jobs:
- name: Check style
run: cargo fmt -- --check

build-and-test:
test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [stable]
include:
- os: ubuntu-latest
rust: nightly
steps:
- uses: actions/checkout@v2
- name: Build
run: cargo build --locked --tests --verbose
- name: Run tests
run: cargo test --locked --verbose
- uses: actions/checkout@v6
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- run: cargo test --all-features --locked --verbose

msrv:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: taiki-e/install-action@cargo-hack
- run: cargo hack --no-dev-deps --rust-version check --package typify
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ members = [

resolver = "2"

[workspace.package]
rust-version = "1.88.0"

[workspace.dependencies]
typify = { version = "0.5.0", path = "typify" }
typify-impl = { version = "0.5.0", path = "typify-impl" }
Expand Down
1 change: 1 addition & 0 deletions cargo-typify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ repository = "https://github.com/oxidecomputer/typify"
readme = "README.md"
keywords = ["json", "schema", "cargo"]
categories = ["api-bindings", "compilers"]
rust-version.workspace = true

default-run = "cargo-typify"

Expand Down
3 changes: 0 additions & 3 deletions rust-toolchain.toml

This file was deleted.

1 change: 1 addition & 0 deletions typify-impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ license = "Apache-2.0"
description = "typify backend implementation"
repository = "https://github.com/oxidecomputer/typify"
readme = "../README.md"
rust-version.workspace = true

[dependencies]
heck = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions typify-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ license = "Apache-2.0"
description = "typify macro implementation"
repository = "https://github.com/oxidecomputer/typify"
readme = "../README.md"
rust-version.workspace = true

[lib]
proc-macro = true
Expand Down
5 changes: 3 additions & 2 deletions typify-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
name = "typify-test"
version = "0.0.0"
edition = "2021"
rust-version.workspace = true

[dependencies]
regress = { workspace = true }
serde = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }

[build-dependencies]
Expand All @@ -14,5 +15,5 @@ typify = { path = "../typify" }
ipnetwork = { workspace = true }
prettyplease = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
serde = { workspace = true, features = ["derive"] }
syn = { workspace = true }
1 change: 1 addition & 0 deletions typify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ repository = "https://github.com/oxidecomputer/typify"
readme = "../README.md"
keywords = ["json", "schema", "proc_macro"]
categories = ["api-bindings", "compilers"]
rust-version.workspace = true

[features]
default = ["macro"]
Expand Down