Skip to content

Commit

Permalink
Bump the minor-changes group with 4 updates (#115)
Browse files Browse the repository at this point in the history
Bumps the minor-changes group with 4 updates:
[is-terminal](https://github.com/sunfishcode/is-terminal),
[toml](https://github.com/toml-rs/toml),
[clap](https://github.com/clap-rs/clap) and
[tempfile](https://github.com/Stebalien/tempfile).

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Ostrovski <[email protected]>
  • Loading branch information
dependabot[bot] and slowli authored Feb 18, 2024
1 parent 597d452 commit 917ec04
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 63 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ inputs.rust_version }}
components: rustfmt, clippy
- name: Install cargo-deny
uses: baptiste0928/cargo-install@v2
uses: baptiste0928/cargo-install@v3
with:
crate: cargo-deny
version: "^0.14"

- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: target
key: ${{ runner.os }}${{ matrix.features }}-msrv-cargo-${{ hashFiles('**/Cargo.lock') }}
Expand All @@ -58,10 +58,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache Docker build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: target/docker
key: ${{ runner.os }}-docker-buildkit-${{ hashFiles('Cargo.lock') }}
Expand All @@ -74,19 +74,19 @@ jobs:
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}

- name: Log in to Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Identify Buildx container
run: |
CONTAINER_ID=$(docker ps --filter=ancestor=moby/buildkit:buildx-stable-1 --format='{{ .ID }}')
Expand All @@ -103,7 +103,7 @@ jobs:
docker buildx du # Check the restored cache
- name: Build image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: cli/Dockerfile
Expand Down Expand Up @@ -167,15 +167,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: target
key: ${{ runner.os }}-cargo-document-${{ hashFiles('Cargo.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Release ${{ matrix.target }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Determine release type
id: release-type
Expand All @@ -47,7 +47,7 @@ jobs:
targets: ${{ matrix.target }}

- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: target
key: ${{ runner.os }}-release-cargo-${{ hashFiles('Cargo.lock') }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
files: ${{ steps.package.outputs.archive }}
prerelease: ${{ steps.release-type.outputs.type == 'prerelease' }}
- name: Attach archive to workflow
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: github.event_name == 'workflow_dispatch'
with:
name: term-transcript-${{ matrix.target }}
Expand Down
60 changes: 24 additions & 36 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ handlebars = { version = "5.1.0", optional = true }
portable-pty = { version = "0.8.0", optional = true }

# Private dependencies (not exposed in the public API).
is-terminal = { version = "0.4.10", optional = true }
is-terminal = { version = "0.4.12", optional = true }
bytecount = "0.6.7"
os_pipe = "1.1.5"
serde = { version = "1.0", optional = true, features = ["derive"] }
Expand All @@ -37,8 +37,8 @@ unicode-width = "0.1.11"
anyhow = "1.0.79"
assert_matches = "1.5.0"
doc-comment = "0.3.3"
test-casing = "0.1.2"
toml = "0.8.9"
test-casing = { version = "0.1.2", git = "https://github.com/slowli/test-casing.git", rev = "dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc" }
toml = "0.8.10"
tracing-capture = "0.1.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
version-sync = "0.9.2"
Expand Down
8 changes: 4 additions & 4 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ path = "src/main.rs"

[dependencies]
anyhow = "1.0.79"
clap = { version = "4.4.18", features = ["derive", "env", "wrap_help"] }
clap = { version = "4.5.0", features = ["derive", "env", "wrap_help"] }
handlebars = "5.1.0"
humantime = "2.1.0"
is-terminal = "0.4.10"
is-terminal = "0.4.12"
serde_json = "1.0"
termcolor = "1.4.1"
toml = "0.8.9"
toml = "0.8.10"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"], optional = true }

term-transcript = { version = "0.3.0", path = ".." }

[dev-dependencies]
tempfile = "3.9.0"
tempfile = "3.10.0"

[features]
default = []
Expand Down
4 changes: 4 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,7 @@ skip-tree = [
[sources]
unknown-registry = "deny"
unknown-git = "deny"
allow-git = [
# Temporary override fixing new Clippy lints
"https://github.com/slowli/test-casing.git",
]
4 changes: 2 additions & 2 deletions e2e-tests/rainbow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ features = ["tracing"]
[dev-dependencies]
handlebars = "5.1.0"
pretty_assertions = "1.0.0"
tempfile = "3.9.0"
test-casing = "0.1.2"
tempfile = "3.10.0"
test-casing = { version = "0.1.2", git = "https://github.com/slowli/test-casing.git", rev = "dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc" }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
//!
//! Snapshot testing. See the [`test` module](crate::test) for more examples.
//!
//! ```
//! ```no_run
//! use term_transcript::{test::TestConfig, ShellOptions};
//!
//! #[test]
Expand Down
2 changes: 1 addition & 1 deletion src/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! Simple scenario in which the tested transcript calls to one or more Cargo binaries / examples
//! by their original names.
//!
//! ```
//! ```no_run
//! use term_transcript::{
//! ShellOptions, Transcript,
//! test::{MatchKind, TestConfig, TestOutputConfig},
Expand Down

0 comments on commit 917ec04

Please sign in to comment.