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.

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

Update dependencies to support Apple M1, fix Windows CI LLVM paths #2026

Merged
merged 4 commits into from Apr 19, 2021
Merged

Update dependencies to support Apple M1, fix Windows CI LLVM paths #2026

merged 4 commits into from Apr 19, 2021

Conversation

fanatid
Copy link
Contributor

@fanatid fanatid commented Apr 17, 2021

@zfnd-bot zfnd-bot bot added this to In progress in 🦓 Apr 17, 2021
@fanatid
Copy link
Contributor Author

fanatid commented Apr 17, 2021

Same windows clang issue as in zcash_script ZcashFoundation/zcash_script#20 🤦 Will do proper fix there first.

teor2345
teor2345 reviewed Apr 17, 2021
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@teor2345
Copy link
Contributor

It looks like it might be a while before GitHub has M1 CI runners:
actions/runner-images#2187

But we can test manually until then.

@fanatid
Copy link
Contributor Author

fanatid commented Apr 17, 2021

Yeah, M1 still not publicity available in GitHub CI 😞
I think it's okay for some time do not to test on M1 in CI. At least these changes allow to use M1 for development.

@fanatid fanatid mentioned this pull request Apr 18, 2021
Merged
@teor2345 teor2345 added this to the 2021 Sprint 7 milestone Apr 19, 2021
dconnolly
dconnolly reviewed Apr 19, 2021
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@dconnolly dconnolly added A-dependencies Area: Dependency file updates A-devops Area: Pipelines, CI/CD and Dockerfiles A-infrastructure Area: Infrastructure changes A-rust Area: Updates to Rust code labels Apr 19, 2021
@fanatid
Copy link
Contributor Author

fanatid commented Apr 19, 2021

Updated to latest crates 🎉

@mpguerra mpguerra removed this from the 2021 Sprint 7 milestone Apr 19, 2021
@teor2345 teor2345 mentioned this pull request Apr 19, 2021
Merged
teor2345
teor2345 requested changes Apr 19, 2021
View reviewed changes
Copy link
Contributor

@teor2345 teor2345 left a comment

Choose a reason for hiding this comment

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

Let's fix the hard-coded block name, and then we're good to merge.

You can also move the lexical-core change to #2026 if you want, but I don't want to block on that.

@teor2345
Copy link
Contributor

Let's fix the hard-coded block name, and then we're good to merge.

You can also move the lexical-core change to #2026 if you want, but I don't want to block on that.

Oops sorry this review was meant for #2018. I'll just go fix that all up now.

teor2345
teor2345 approved these changes Apr 19, 2021
View reviewed changes
Copy link
Contributor

@teor2345 teor2345 left a comment

Choose a reason for hiding this comment

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

Looks like we're good to merge here.

@teor2345 teor2345 changed the title build(deps): update for Apple M1 Update dependencies to support Apple M1, fix Windows CI LLVM paths Apr 19, 2021
@teor2345 teor2345 merged commit fb799b2 into ZcashFoundation:main Apr 19, 2021
🦓 automation moved this from In progress to Done Apr 19, 2021
@teor2345
Copy link
Contributor

Thanks for all your hard work on this PR, and the zcash_script PR!

@teor2345
Copy link
Contributor

teor2345 commented Apr 19, 2021 •
edited

I updated the title to describe what the merged PR actually does, so our changelog is accurate.

There's no need to match the dependabot title format for future PRs. Having different PR titles from dependabot actually helps us identify manual changes in the changelog.

@fanatid fanatid deleted the m1-update branch April 19, 2021 11:09
@dconnolly dconnolly added this to the 2021 Sprint 7 milestone Apr 19, 2021
@teor2345 teor2345 mentioned this pull request Apr 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dconnolly dconnolly dconnolly left review comments

@teor2345 teor2345 teor2345 approved these changes

Assignees

@fanatid fanatid

Labels
A-dependencies Area: Dependency file updates A-devops Area: Pipelines, CI/CD and Dockerfiles A-infrastructure Area: Infrastructure changes A-rust Area: Updates to Rust code
Projects
No open projects
🦓
  
Done
Milestone
2021 Sprint 7
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fanatid @teor2345 @dconnolly @mpguerra