Skip to content

Use an explicit rev for oxidecomputer git deps#1936

Merged
jmpesp merged 1 commit into
mainfrom
explicit_rev
May 14, 2026
Merged

Use an explicit rev for oxidecomputer git deps#1936
jmpesp merged 1 commit into
mainfrom
explicit_rev

Conversation

@jmpesp
Copy link
Copy Markdown
Contributor

@jmpesp jmpesp commented May 14, 2026

Chasing down a cargo build failure in propolis caused by multiple versions of the same package lead to the discovery that rev of omicron that is in propolis' lock file is old, about 700 commits behind main. Once propolis was updated to the same rev of omicron that crucible uses, cargo no longer hit that same build error.

Use explicit git revs in Cargo.toml: this doesn't change the version in the lock file but does make it explicit what is being used. Propolis will be updated shortly to pull this commit in (a no-op, as the lockfile version doesn't change), and will be updated to use explicit revs in the same way.

Chasing down a cargo build failure in propolis caused by multiple
versions of the same package lead to the discovery that rev of omicron
that is in propolis' lock file is old, about 700 commits behind main.
Once propolis was updated to the same rev of omicron that crucible uses,
cargo no longer hit that same build error.

Use explicit git revs in Cargo.toml: this doesn't change the version in
the lock file but does make it explicit what is being used. Propolis
will be updated shortly to pull this commit in (a no-op, as the lockfile
version doesn't change), and will be updated to use explicit revs in the
same way.
@jmpesp jmpesp requested a review from leftwo May 14, 2026 13:46
Copy link
Copy Markdown
Contributor

@leftwo leftwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this just make it obvious that we are not updating these dependencies?
because of the lock file, it means that we get "main" from whatever time the lockfile has and it won't be updated unless someone does something to update it?
Also, renovate, should it be tracking this?

@jmpesp
Copy link
Copy Markdown
Contributor Author

jmpesp commented May 14, 2026

Does this just make it obvious that we are not updating these dependencies?
because of the lock file, it means that we get "main" from whatever time the lockfile has and it won't be updated unless someone does something to update it?

yeah, it's basically moving the information into the much more readable Cargo.toml.

Also, renovate, should it be tracking this?

Maybe! Not sure :)

@jmpesp jmpesp merged commit bd9a0e2 into main May 14, 2026
17 checks passed
@jmpesp jmpesp deleted the explicit_rev branch May 14, 2026 15:48
jmpesp added a commit to oxidecomputer/propolis that referenced this pull request May 14, 2026
Bump crucible rev to latest, and use explicit revs

Pick up the following Crucible PRs:

- Use an explicit rev for oxidecomputer git deps (oxidecomputer/crucible#1936)
- Add Clone and Deserialize to VolumeInfo et al (oxidecomputer/crucible#1935)
- Update omicron/oximeter (oxidecomputer/crucible#1933)
- [meta] update to drift 0.1.4 (oxidecomputer/crucible#1932)
- Don't log if there is nothing to log (oxidecomputer/crucible#1930)

Also, similar to oxidecomputer/crucible#1936, switch the omicron related
dependencies from 'branch = "main"' to an explicit rev. Previous to this
commit, _two_ old versions of omicron were being pulled in: `becbbb61`
and `b8efb9a0`. The first one is about 300 commits behind, and the
second is about 700 commits behind. With explicit git revs, the rev
being used moves to Cargo.toml, and is known without digging into the
lockfile.

Related, the tokio dep had to be further specified in order to build.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants