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

v0.102.3, bump aws-lc-rs from 1.6.4 to 1.7.0, MSRV 1.63 #248

Merged
merged 4 commits into from
Apr 22, 2024

Conversation

cpu
Copy link
Member

@cpu cpu commented Apr 17, 2024

Replaces #246 A few additional changes are required above what was in #246:

proj: MSRV 1.61 -> 1.63

We're seeing more of our deps move to this MSRV or higher (in this case, a transitive dep on jobserver) and it's shipped in Debian stable. Time to move our MSRV to 1.63.

ci: ubuntu-20.04 -> ubuntu-latest

Changing the runner image to ubuntu-latest takes a Ubuntu 22.04 image that includes GCC 11. This is notable because the latest aws-lc-rs build script bails when compiled with a GCC version affected by a nasty memcpy bug. The 20.04 image uses GCC 9 and is affected.

We prefer ubuntu-latest in our other repositories so this change should be uncontroversial.

aws-lc-rs 1.7.0

Updates aws-lc-rs from 1.6.4 to 1.7.0 (diff.rs). See upstream release notes for more information.

Proposed Release Notes

  • Updates aws-lc-rs to 1.7.0
  • MSRV increased from 1.61 to 1.63

@cpu
Copy link
Member Author

cpu commented Apr 17, 2024

Required statuses must pass before merging

Will need to admin merge this one & then fixup the branch protection rules 😮‍💨

Copy link

codecov bot commented Apr 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.21%. Comparing base (6f57e3c) to head (104a0a9).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #248   +/-   ##
=======================================
  Coverage   97.21%   97.21%           
=======================================
  Files          19       19           
  Lines        4100     4100           
=======================================
  Hits         3986     3986           
  Misses        114      114           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@djc
Copy link
Member

djc commented Apr 18, 2024

Cargo: pin jobserver at 0.1.26

Anything newer requires a MSRV of 1.63+.

This will be a little annoying -- will mean we need to redo every Dependabot PR to keep jobserver pinned. Maybe this is the straw that has us move to 1.63? I think the fact that Debian stable has 1.63 makes this a common target for MSRV anyway, and it's still pretty conservative compared to most of the ecosystem.

(tokio, hyper and reqwest are all at 1.63 -- Quinn is at 1.66, hickory-dns at 1.67.)

Screenshot 2024-04-18 at 09 34 27

@cpu
Copy link
Member Author

cpu commented Apr 18, 2024

Maybe this is the straw that has us move to 1.63?

Sounds good. We've been dancing around that decision a few times now. Let's just do it.

cpu added 3 commits April 18, 2024 10:29
Changing the runner image to `ubuntu-latest` takes a Ubuntu 22.04 image
that includes GCC 11. This is notable because the latest aws-lc-rs build
script bails[0] when compiled with a GCC version affected by a `memcpy`
bug[1]. The 20.04 image uses GCC 9 and _is_ affected.

We prefer `ubuntu-latest` in our other repositories so this change
should be uncontroversial.

[0]: https://github.com/aws/aws-lc-rs/blob/575f7d0656250e5302f8a9ce2ae34b3d098799b2/aws-lc-sys/builder/cc_builder.rs#L202-L260
[1]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95189
We're seeing more of our deps move to this MSRV or higher and it's
shipped in Debian stable. Time to move our MSRV to 1.63.
@cpu
Copy link
Member Author

cpu commented Apr 18, 2024

Dropped the commit pinning jobserver and bumped the MSRV to 1.63.

@cpu cpu requested review from ctz and djc April 18, 2024 14:35
@cpu
Copy link
Member Author

cpu commented Apr 18, 2024

Cargo: v0.102.2 -> 0.102.3

Tacked a version bump on here based on discussion in rustls/rustls#1902

@cpu cpu changed the title bump aws-lc-rs from 1.6.4 to 1.7.0 v0.102.3, bump aws-lc-rs from 1.6.4 to 1.7.0, MSRV 1.63 Apr 18, 2024
@djc djc enabled auto-merge April 22, 2024 07:30
@cpu cpu disabled auto-merge April 22, 2024 13:10
@cpu
Copy link
Member Author

cpu commented Apr 22, 2024

cpu disabled auto-merge now

Another one that needs an admin merge + fixup because of the Ubuntu version change and the branch protection rules including the version string.

@cpu cpu merged commit 7fc65f1 into rustls:main Apr 22, 2024
30 checks passed
@cpu cpu deleted the cpu-aws-lc-rs-1.7.0 branch April 22, 2024 13:11
@cpu
Copy link
Member Author

cpu commented Apr 22, 2024

Note: I also had to add one more item to the release notes than my proposal above to cover #229 Sorry for missing that up-front.

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.

None yet

3 participants