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

Bump jobserver and fix non-portable builds #5641

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

michaelsproul
Copy link
Member

Issue Addressed

Fix broken builds as in: https://github.com/sigp/lighthouse/actions/runs/8809536524/job/24180492013

Closes:

Proposed Changes

  • The main fix is to bump jobserver from 0.1.30 to 0.1.31 to remove usage of the preadv2 syscall that was broken under Cross: rust-lang/jobserver-rs@66782f5
  • This PR also turns off default-features for c-kzg so that it's possible to compile Lighthouse without portable blst. Even though we're switching to portable by default (Only portable builds (binaries) #5615) we may as well unbreak the ability to build non-portable binaries.

@michaelsproul michaelsproul added ready-for-review The code is ready for review low-hanging-fruit Easy to resolve, get it before someone else does! infra-ci labels Apr 24, 2024
@michaelsproul
Copy link
Member Author

Prior to this PR, both make build-x86_64 and make build-x86_64-portable were broken on my machine. With this PR, both work.

Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

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

LGTM!

@jimmygchen jimmygchen added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Apr 24, 2024
@michaelsproul
Copy link
Member Author

@Mergifyio queue

Copy link

mergify bot commented Apr 24, 2024

queue

🛑 The pull request has been removed from the queue default

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@jimmygchen
Copy link
Member

@mergify requeue

Copy link

mergify bot commented Apr 24, 2024

requeue

✅ This pull request will be re-embarked automatically

The followup queue command will be automatically executed to re-embark the pull request

Copy link

mergify bot commented Apr 24, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 1eaaa4a

mergify bot added a commit that referenced this pull request Apr 24, 2024
@mergify mergify bot merged commit 1eaaa4a into sigp:unstable Apr 24, 2024
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infra-ci low-hanging-fruit Easy to resolve, get it before someone else does! ready-for-merge This PR is ready to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants