Skip to content

dep hygiene: switch from vergen-gitcl to vergen-git2 #9111

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

dep hygiene: switch from vergen-gitcl to vergen-git2 #9111

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
18 changes: 2 additions & 16 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ url = "2.5.4"
usdt = "0.5.0"
uuid = { version = "1.17.0", features = ["serde", "v4"] }
uzers = "0.12"
vergen-gitcl = { version = "1.0.8" }
vergen-git2 = { version = "1.0.7" }
walkdir = "2.5"
whoami = "1.5"
wicket = { path = "wicket" }
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/omdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ workspace = true

[build-dependencies]
omicron-rpaths.workspace = true
vergen-gitcl.workspace = true
vergen-git2.workspace = true

[dependencies]
anyhow.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions dev-tools/omdb/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use vergen_gitcl::Emitter;
use vergen_gitcl::GitclBuilder;
use vergen_git2::Emitter;
use vergen_git2::Git2Builder;

fn main() {
// See omicron-rpaths for documentation. NOTE: This file MUST be kept in
Expand All @@ -16,13 +16,13 @@ fn main() {
//
// We use this to check our own git SHA against the git SHA of the Nexus
// that generated blueprint planner debug logs.
let gitcl = GitclBuilder::default()
let git2 = Git2Builder::default()
.sha(/* short= */ false)
.dirty(/* include_untracked= */ false)
.build()
.expect("valid GitclBuilder configuration");
.expect("valid Git2Builder configuration");
Emitter::default()
.add_instructions(&gitcl)
.add_instructions(&git2)
.expect("valid instructions")
.emit()
.expect("emitted version information");
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ workspace = true

[build-dependencies]
omicron-rpaths.workspace = true
vergen-gitcl.workspace = true
vergen-git2.workspace = true

[dependencies]
anyhow.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions nexus/db-model/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use vergen_gitcl::Emitter;
use vergen_gitcl::GitclBuilder;
use vergen_git2::Emitter;
use vergen_git2::Git2Builder;

fn main() {
// See omicron-rpaths for documentation. NOTE: This file MUST be kept in
Expand All @@ -17,13 +17,13 @@ fn main() {
// We embed our git SHA in the JSON blobs for blueprint planner debug logs,
// so `omdb` can report if it's out of sync with the Nexus that created the
// debug log.
let gitcl = GitclBuilder::default()
let git2 = Git2Builder::default()
.sha(/* short= */ false)
.dirty(/* include_untracked= */ false)
.build()
.expect("valid GitclBuilder configuration");
.expect("valid Git2Builder configuration");
Emitter::default()
.add_instructions(&gitcl)
.add_instructions(&git2)
.expect("valid instructions")
.emit()
.expect("emitted version information");
Expand Down
Loading