From 654fa4941af64c61841df073c475c333dac1b8be Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Tue, 17 Sep 2024 13:02:40 -0400 Subject: [PATCH] depsup, version bump for next release (#380) * depsup, version bump for next release * Bump MSRV to 1.74.0 due to sysinfo --- .github/workflows/vergen.yml | 8 ++++---- .github/workflows/vergen_git2.yml | 8 ++++---- .github/workflows/vergen_gitcl.yml | 8 ++++---- .github/workflows/vergen_gix.yml | 8 ++++---- .github/workflows/vergen_lib.yml | 8 ++++---- .github/workflows/vergen_pretty.yml | 8 ++++---- README.md | 2 +- test_util/Cargo.toml | 8 ++++---- test_util/src/repo/mod.rs | 4 ++-- vergen-git2/Cargo.toml | 14 +++++++------- vergen-gitcl/Cargo.toml | 14 +++++++------- vergen-gix/Cargo.toml | 16 ++++++++-------- vergen-lib/Cargo.toml | 8 ++++---- vergen-pretty/Cargo.toml | 18 +++++++++--------- vergen/Cargo.toml | 16 ++++++++-------- 15 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/vergen.yml b/.github/workflows/vergen.yml index 846467fe..bcb8f621 100644 --- a/.github/workflows/vergen.yml +++ b/.github/workflows/vergen.yml @@ -60,7 +60,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-unknown-linux-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -76,7 +76,7 @@ jobs: strategy: matrix: os: [macos-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-apple-darwin] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -92,7 +92,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -108,7 +108,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-msvc] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: diff --git a/.github/workflows/vergen_git2.yml b/.github/workflows/vergen_git2.yml index d1a28a70..d2235690 100644 --- a/.github/workflows/vergen_git2.yml +++ b/.github/workflows/vergen_git2.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-unknown-linux-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [macos-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-apple-darwin] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -98,7 +98,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-msvc] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: diff --git a/.github/workflows/vergen_gitcl.yml b/.github/workflows/vergen_gitcl.yml index 446097e2..f3785b61 100644 --- a/.github/workflows/vergen_gitcl.yml +++ b/.github/workflows/vergen_gitcl.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-unknown-linux-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [macos-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-apple-darwin] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -98,7 +98,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-msvc] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: diff --git a/.github/workflows/vergen_gix.yml b/.github/workflows/vergen_gix.yml index 74141371..229f2ff3 100644 --- a/.github/workflows/vergen_gix.yml +++ b/.github/workflows/vergen_gix.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-unknown-linux-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [macos-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-apple-darwin] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -98,7 +98,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-msvc] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: diff --git a/.github/workflows/vergen_lib.yml b/.github/workflows/vergen_lib.yml index 8e28627c..6751aef7 100644 --- a/.github/workflows/vergen_lib.yml +++ b/.github/workflows/vergen_lib.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-unknown-linux-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [macos-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-apple-darwin] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -98,7 +98,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-msvc] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: diff --git a/.github/workflows/vergen_pretty.yml b/.github/workflows/vergen_pretty.yml index f49ee51e..8fe38a60 100644 --- a/.github/workflows/vergen_pretty.yml +++ b/.github/workflows/vergen_pretty.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-unknown-linux-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [macos-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-apple-darwin] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-gnu] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: @@ -98,7 +98,7 @@ jobs: strategy: matrix: os: [windows-latest] - channel: ["1.73.0", "stable", "beta", "nightly"] + channel: ["1.74.0", "stable", "beta", "nightly"] target: [x86_64-pc-windows-msvc] uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main with: diff --git a/README.md b/README.md index c6bf7cbb..45937a3a 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ to rerun instruction emission if the `SOURCE_DATE_EPOCH` environment variable ha [![Crates.io](https://img.shields.io/crates/d/vergen-pretty.svg)](https://crates.io/crates/vergen-pretty) ## MSRV -The current minimum supported rust version is 1.73.0 +The current minimum supported rust version is 1.74.0 ## ⚠️ Notes on version 9 ⚠️ * Version 9 introduces 3 new libraries, `vergen-git2`, `vergen-gitcl`, and `vergen-gix` that will be versioned independently from `vergen`. diff --git a/test_util/Cargo.toml b/test_util/Cargo.toml index 3ea9dde7..f58f62db 100644 --- a/test_util/Cargo.toml +++ b/test_util/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "test_util" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "0.1.1" +version = "0.1.2" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -29,8 +29,8 @@ unstable = [] repo = ["gix", "rand"] [dependencies] -anyhow = { version = "1.0.86" } -gix = { version = "0.63.0", default-features = false, features = [ +anyhow = { version = "1.0.89" } +gix = { version = "0.66.0", default-features = false, features = [ "revision", "worktree-mutation", "blocking-network-client", diff --git a/test_util/src/repo/mod.rs b/test_util/src/repo/mod.rs index 14ff7922..9bb2e3ec 100644 --- a/test_util/src/repo/mod.rs +++ b/test_util/src/repo/mod.rs @@ -126,8 +126,8 @@ impl TestRepos { // Setup the base configuration let mut config = repo.config_snapshot_mut(); - let _old = config.set_raw_value("user", None, "name", "Vergen Test")?; - let _old = config.set_raw_value("user", None, "email", "vergen@blah.com")?; + let _old = config.set_raw_value(&"user.name", "Vergen Test")?; + let _old = config.set_raw_value(&"user.email", "vergen@blah.com")?; { // Create an empty commit with the initial empty tree diff --git a/vergen-git2/Cargo.toml b/vergen-git2/Cargo.toml index f7a0620a..44c7e6d8 100644 --- a/vergen-git2/Cargo.toml +++ b/vergen-git2/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "vergen-git2" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "1.0.0" +version = "1.0.1" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -33,23 +33,23 @@ unstable = ["vergen/unstable", "vergen-lib/unstable"] si = ["vergen/si"] [dependencies] -anyhow = "1.0.86" -derive_builder = "0.20.0" +anyhow = "1.0.89" +derive_builder = "0.20.1" git2-rs = { version = "0.19.0", package = "git2", default-features = false } time = { version = "0.3.36", features = [ "formatting", "local-offset", "parsing", ] } -vergen = { version = "9.0.0", path = "../vergen", default-features = false } -vergen-lib = { version = "0.1.3", path = "../vergen-lib", features = ["git"] } +vergen = { version = "9.0.1", path = "../vergen", default-features = false } +vergen-lib = { version = "0.1.4", path = "../vergen-lib", features = ["git"] } [build-dependencies] rustversion = "1.0.17" [dev-dependencies] lazy_static = "1.5.0" -regex = "1.10.5" +regex = "1.10.6" serial_test = "3.1.1" temp-env = "0.3.6" test_util = { path = "../test_util", features = ["repo", "unstable"] } diff --git a/vergen-gitcl/Cargo.toml b/vergen-gitcl/Cargo.toml index 0f4e94c3..45dccb08 100644 --- a/vergen-gitcl/Cargo.toml +++ b/vergen-gitcl/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "vergen-gitcl" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "1.0.0" +version = "1.0.1" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -33,22 +33,22 @@ unstable = ["vergen/unstable", "vergen-lib/unstable"] si = ["vergen/si"] [dependencies] -anyhow = "1.0.86" -derive_builder = "0.20.0" +anyhow = "1.0.89" +derive_builder = "0.20.1" time = { version = "0.3.36", features = [ "formatting", "local-offset", "parsing", ] } -vergen = { version = "9.0.0", path = "../vergen", default-features = false } -vergen-lib = { version = "0.1.3", path = "../vergen-lib", features = ["git"] } +vergen = { version = "9.0.1", path = "../vergen", default-features = false } +vergen-lib = { version = "0.1.4", path = "../vergen-lib", features = ["git"] } [build-dependencies] rustversion = "1.0.17" [dev-dependencies] lazy_static = "1.5.0" -regex = "1.10.5" +regex = "1.10.6" serial_test = "3.1.1" temp-env = "0.3.6" test_util = { path = "../test_util", features = ["repo", "unstable"] } diff --git a/vergen-gix/Cargo.toml b/vergen-gix/Cargo.toml index 89ad02d7..1786f062 100644 --- a/vergen-gix/Cargo.toml +++ b/vergen-gix/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "vergen-gix" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "1.0.1" +version = "1.0.2" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -38,9 +38,9 @@ unstable = ["vergen/unstable", "vergen-lib/unstable"] si = ["vergen/si"] [dependencies] -anyhow = "1.0.86" -derive_builder = "0.20.0" -gix = { version = "0.63.0", default-features = false, features = [ +anyhow = "1.0.89" +derive_builder = "0.20.1" +gix = { version = "0.66.0", default-features = false, features = [ "revision", "interrupt", ] } @@ -49,15 +49,15 @@ time = { version = "0.3.36", features = [ "local-offset", "parsing", ] } -vergen = { version = "9.0.0", path = "../vergen", default-features = false } -vergen-lib = { version = "0.1.3", path = "../vergen-lib", features = ["git"] } +vergen = { version = "9.0.1", path = "../vergen", default-features = false } +vergen-lib = { version = "0.1.4", path = "../vergen-lib", features = ["git"] } [build-dependencies] rustversion = "1.0.17" [dev-dependencies] lazy_static = "1.5.0" -regex = "1.10.5" +regex = "1.10.6" test_util = { path = "../test_util", features = ["repo", "unstable"] } serial_test = "3.1.1" temp-env = "0.3.6" diff --git a/vergen-lib/Cargo.toml b/vergen-lib/Cargo.toml index 1cfa282f..e198a8d2 100644 --- a/vergen-lib/Cargo.toml +++ b/vergen-lib/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "vergen-lib" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "0.1.3" +version = "0.1.4" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -39,8 +39,8 @@ unstable = [] si = [] [dependencies] -anyhow = "1.0.86" -derive_builder = "0.20.0" +anyhow = "1.0.89" +derive_builder = "0.20.1" [build-dependencies] rustversion = "1.0.17" diff --git a/vergen-pretty/Cargo.toml b/vergen-pretty/Cargo.toml index 204fbb9d..4374e298 100644 --- a/vergen-pretty/Cargo.toml +++ b/vergen-pretty/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "vergen-pretty" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "0.3.4" +version = "0.3.5" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -39,22 +39,22 @@ __vergen_test = ["vergen-gix", "vergen-gix/unstable"] __vergen_empty_test = ["vergen-gix", "vergen-gix/unstable"] [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.89" console = { version = "0.15.8", optional = true } convert_case = "0.6.0" -derive_builder = "0.20.0" +derive_builder = "0.20.1" lazy_static = { version = "1.5.0", optional = true } rand = { version = "0.8.5", optional = true } -serde = { version = "1.0.204", features = ["derive"], optional = true } +serde = { version = "1.0.210", features = ["derive"], optional = true } tracing = { version = "0.1.40", features = [ "max_level_trace", "release_max_level_trace", ], optional = true } [build-dependencies] -anyhow = "1.0.86" +anyhow = "1.0.89" rustversion = "1.0.17" -vergen-gix = { version = "1.0.0", path = "../vergen-gix", features = [ +vergen-gix = { version = "1.0.2", path = "../vergen-gix", features = [ "build", "cargo", "rustc", @@ -63,8 +63,8 @@ vergen-gix = { version = "1.0.0", path = "../vergen-gix", features = [ [dev-dependencies] lazy_static = "1.5.0" -regex = "1.10.5" -serde_json = "1.0.120" +regex = "1.10.6" +serde_json = "1.0.128" tracing-subscriber = { version = "0.3.18", features = ["fmt"] } [package.metadata.docs.rs] diff --git a/vergen/Cargo.toml b/vergen/Cargo.toml index 6e1442c7..6eaacd84 100644 --- a/vergen/Cargo.toml +++ b/vergen/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" homepage = "https://github.com/rustyhorde/vergen" keywords = ["cargo", "instructions", "build", "tool"] license = "MIT OR Apache-2.0" -rust-version = "1.73.0" +rust-version = "1.74.0" name = "vergen" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "9.0.0" +version = "9.0.1" [package.metadata.cargo-matrix] [[package.metadata.cargo-matrix.channel]] @@ -33,25 +33,25 @@ unstable = ["vergen-lib/unstable"] emit_and_set = ["vergen-lib/emit_and_set"] [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.89" cargo_metadata = { version = "0.18.1", optional = true } -derive_builder = "0.20.0" -regex = { version = "1.10.5", optional = true } +derive_builder = "0.20.1" +regex = { version = "1.10.6", optional = true } rustc_version = { version = "0.4.0", optional = true } -sysinfo = { version = "0.30.13", optional = true, default-features = false } +sysinfo = { version = "0.31.4", optional = true } time = { version = "0.3.36", features = [ "formatting", "local-offset", "parsing", ], optional = true } -vergen-lib = { version = "0.1.3", path = "../vergen-lib" } +vergen-lib = { version = "0.1.4", path = "../vergen-lib" } [build-dependencies] rustversion = "1.0.17" [dev-dependencies] lazy_static = "1.5.0" -regex = "1.10.5" +regex = "1.10.6" test_util = { path = "../test_util", features = ["unstable"] } serial_test = "3.1.1" temp-env = "0.3.6"