Skip to content

Pin qorb's revision#6876

Merged
smklein merged 4 commits into
mainfrom
qorb-pin
Oct 15, 2024
Merged

Pin qorb's revision#6876
smklein merged 4 commits into
mainfrom
qorb-pin

Conversation

@smklein

@smklein smklein commented Oct 15, 2024

Copy link
Copy Markdown
Collaborator

I'd like to integrate oxidecomputer/qorb#45 into qorb, and then omicron, but I want to be able to control that revision explicitly.

Before I do that, pin the revision of qorb we're using so that "merging something into qorb" doesn't break omicron.

@sunshowers

sunshowers commented Oct 15, 2024

Copy link
Copy Markdown
Contributor

Thanks. Are you sure this is a good idea? Because it means that if non-Omicron workspaces depend on a different revision of qorb it might become hard to reconcile that with Omicron -- you'll have two copies of qorb floating around. Using main avoids these problems.

Pinning qorb in Cargo.lock might be enough, maybe?

@smklein

smklein commented Oct 15, 2024

Copy link
Copy Markdown
Collaborator Author

I thought that if I specified "use the master branch" in cargo.toml, and then manually tried to update cargo.lock, that change to the lockfile would get overwritten the next time someone tries to build?

My concern is that if I commit a breaking change to qorb it'll immediately break omicron's build

@smklein

smklein commented Oct 15, 2024

Copy link
Copy Markdown
Collaborator Author

I could also just start publishing / using published versions of qorb?

@smklein

smklein commented Oct 15, 2024

Copy link
Copy Markdown
Collaborator Author

I could also just start publishing / using published versions of qorb?

Hrm, okay, can't do this without updating diesel-dtrace, where we also seem to be using the main branch

@smklein smklein requested a review from sunshowers October 15, 2024 20:26
@smklein

smklein commented Oct 15, 2024

Copy link
Copy Markdown
Collaborator Author

I published a new revision of diesel-dtrace and qorb, and I'm using them here now.

@sunshowers

Copy link
Copy Markdown
Contributor

I thought that if I specified "use the master branch" in cargo.toml, and then manually tried to update cargo.lock, that change to the lockfile would get overwritten the next time someone tries to build?

Only if something causes the update to happen -- in general, the git repo being updated by itself won't cause a local update. In your case I guess you bumped another dependency which caused it?

My concern is that if I commit a breaking change to qorb it'll immediately break omicron's build

No, this won't happen automatically.

@sunshowers sunshowers left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This definitely works!

I'd recommend publishing qorb 0.1.0 soon btw, 0.0.x versions being unable to be patched has caused a lot of problems for me in the past.

@smklein smklein enabled auto-merge (squash) October 15, 2024 21:35
@smklein smklein merged commit 7f90954 into main Oct 15, 2024
@smklein smklein deleted the qorb-pin branch October 15, 2024 22:52
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