Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lock file maintenance #78

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Lock file maintenance #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
106 changes: 53 additions & 53 deletions .github/workflows/rust.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ jobs:
name: Check
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Check all features
run: cargo check --tests --all-features
- name: Check with default features
run: cargo check --tests
- name: Check without default features
run: cargo check --tests --no-default-features
- name: Check with only stream feature
run: cargo check --tests --no-default-features --features stream
- name: Check with only mock feature
run: cargo check --tests --no-default-features --features mock
- name: Check with only interval feature
run: cargo check --tests --no-default-features --features interval
- name: Check with mock and interval feature
run: cargo check --tests --no-default-features --features mock,interval
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Check all features
run: cargo check --tests --all-features
- name: Check with default features
run: cargo check --tests
- name: Check without default features
run: cargo check --tests --no-default-features
- name: Check with only stream feature
run: cargo check --tests --no-default-features --features stream
- name: Check with only mock feature
run: cargo check --tests --no-default-features --features mock
- name: Check with only interval feature
run: cargo check --tests --no-default-features --features interval
- name: Check with mock and interval feature
run: cargo check --tests --no-default-features --features mock,interval

check-msrv:
name: Check with Minimum Supported Rust Version
Expand All @@ -34,41 +34,41 @@ jobs:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@1.64
- uses: Swatinem/rust-cache@v2
- name: Check all features
run: cargo check --workspace --tests --all-features
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@1.70
- uses: Swatinem/rust-cache@v2
- name: Check all features
run: cargo check --workspace --tests --all-features

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Run clippy linter
run: cargo clippy --all-features --tests --workspace -- -D warnings
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Run clippy linter
run: cargo clippy --all-features --tests --workspace -- -D warnings

rustfmt:
name: Check formatting with rustfmt
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
- uses: Swatinem/rust-cache@v2
- name: Check formatting
run: cargo fmt --all -- --check
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
- uses: Swatinem/rust-cache@v2
- name: Check formatting
run: cargo fmt --all -- --check

test:
name: Test
Expand All @@ -77,12 +77,12 @@ jobs:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Build
run: cargo build --all-features
- name: Run tests
run: cargo test --all-features
- name: Checkout
uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Build
run: cargo build --all-features
- name: Run tests
run: cargo test --all-features
27 changes: 8 additions & 19 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions async-time-mock-async-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ authors = [
"Max Bruckner",
"Thomas Keppler",
]
rust-version = "1.64"
rust-version = "1.70"

[dependencies]
async-std = "1"
async-time-mock-core = {version = "0.1", path = "../async-time-mock-core", optional = true}
async-time-mock-core = { version = "0.1", path = "../async-time-mock-core", optional = true }

[dev-dependencies]
async-std = {version = "1", features = ["attributes"]}
async-std = { version = "1", features = ["attributes"] }

[features]
default = ["interval"]
Expand Down
2 changes: 1 addition & 1 deletion async-time-mock-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
"Max Bruckner",
"Thomas Keppler",
]
rust-version = "1.64"
rust-version = "1.70"

[dependencies]
async-lock = { version = "3", default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions async-time-mock-smol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ authors = [
"Max Bruckner",
"Thomas Keppler",
]
rust-version = "1.64"
rust-version = "1.70"

[dependencies]
async-time-mock-core = {version = "0.1", path = "../async-time-mock-core", optional = true}
async-time-mock-core = { version = "0.1", path = "../async-time-mock-core", optional = true }
# in order to minimize the amount of dependencies pulled in, use the `async-io` library for timers, which `smol` just reexports
async-io = "2"
# required for the Stream trait and already a dependency of async-io
futures-core = {version = "0.3", optional = true}
futures-core = { version = "0.3", optional = true }

[dev-dependencies]
smol = "2"
Expand Down
2 changes: 1 addition & 1 deletion async-time-mock-tokio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
"Max Bruckner",
"Thomas Keppler",
]
rust-version = "1.64"
rust-version = "1.70"


[dependencies]
Expand Down