Skip to content
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.

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

quasi-lock dependencies in omicron-common job #6692

Merged
merged 2 commits into from
Sep 26, 2024

Conversation

iximeow
Copy link
Member

@iximeow iximeow commented Sep 26, 2024

"fixes" #6691 by stealing the checked-in Cargo.lock when building the standalone omicron-common crate created for this job. this lets us keep the specific refs of git dependencies that are ref="main" and similar, which might otherwise resolve to different commits than the rest of the tree (and its omicron-common) can actually build with.

it'd be nice to have fewer git dependencies using branch names for refs, either by using a cratesio crate or specific commit or something, but this seems to make things a bit less brittle in the mean time.

https://github.com/oxidecomputer/omicron/runs/30726055679 passes here while failing to build on main 🎉

Copy link
Contributor

@sunshowers sunshowers left a comment

Choose a reason for hiding this comment

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

it'd be nice to have fewer git dependencies using branch names for refs [...] by using a [...] specific commit

Ah sadly that isn't possible because that will cause a lot of duplicate deps when used across Cargo workspaces. Putting stuff on crates.io would help but then we'd have to manage semver.

On balance we've generally found using a branch name to be the least bad option.

.github/buildomat/jobs/omicron-common.sh Show resolved Hide resolved
@iximeow
Copy link
Member Author

iximeow commented Sep 26, 2024

all three workflow failures here are different kinds of flakes!

the first commit saw the same as #6506 (and log lines), the second saw #6505 (and log lines), as well as helios/deploy failing because the host was so out of memory it couldn't page anything out..

@iximeow iximeow merged commit bd3e173 into main Sep 26, 2024
16 checks passed
@iximeow iximeow deleted the ixi/lock-omicron-common-deps branch September 26, 2024 23:54
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.

3 participants