Skip to content

Fix build from merge skew #30724

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

Jump to bottom
Merged
def- merged 1 commit into from
Dec 4, 2024
Merged

Fix build from merge skew #30724

def- merged 1 commit into from
Dec 4, 2024

Conversation

@def-
Copy link
Contributor

@def- def- commented Dec 4, 2024 •
edited
Loading

Seen failing in https://buildkite.com/materialize/test/builds/95791#01939264-eef7-4ac1-99f6-7389fa781c05

Merge skew from #30634 and #30690

Verified locally:

    Finished `dev` profile [unoptimized + debuginfo] target(s) in 6m 04s

Checklist

  • This PR has adequate test coverage / QA involvement has been duly considered. (trigger-ci for additional test/nightly runs)
  • This PR has an associated up-to-date design doc, is a design doc (template), or is sufficiently small to not require a design.
  • If this PR evolves an existing $T ⇔ Proto$T mapping (possibly in a backwards-incompatible way), then it is tagged with a T-proto label.
  • If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label (example).
  • If this PR includes major user-facing behavior changes, I have pinged the relevant PM to schedule a changelog post.

@def- def- marked this pull request as ready for review December 4, 2024 17:12
@def- def- requested a review from a team as a code owner December 4, 2024 17:12
@def- def- requested review from frankmcsherry and ggevay December 4, 2024 17:14
@def- def- enabled auto-merge December 4, 2024 17:14
@def- def- changed the title Fix build Fix build from merge skew Dec 4, 2024
ggevay
ggevay approved these changes Dec 4, 2024
View reviewed changes
Copy link
Contributor

@ggevay ggevay left a comment

Choose a reason for hiding this comment

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

Sorry! Thanks for fixing it!

@def- def- merged commit aa87fb3 into MaterializeInc:main Dec 4, 2024
79 checks passed
@def- def- deleted the pr-fix-build branch December 4, 2024 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggevay ggevay ggevay approved these changes

@frankmcsherry frankmcsherry Awaiting requested review from frankmcsherry

+1 more reviewer

@ParkMyCar ParkMyCar ParkMyCar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@def- @ParkMyCar @ggevay