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

Aws updates #340368

Merged
merged 14 commits into from
Nov 19, 2024
Merged

Aws updates #340368

merged 14 commits into from
Nov 19, 2024
+52 −35

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Sep 7, 2024 •
edited
Loading

Pr is on the staging master merge-base so target can be switched over to staging if needed.

Diff: https://www.github.com/awslabs/aws-c-auth/compare/v0.7.25...v0.7.29## Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Artturin
Copy link
Member Author

Artturin commented Sep 7, 2024

@ofborg build aws-sdk-cpp.passthru.tests

@ofborg ofborg bot requested a review from r-burns September 7, 2024 20:41
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 10, 2024
@Artturin Artturin changed the base branch from master to staging September 11, 2024 00:35
@Artturin Artturin removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 11, 2024
@Artturin
Copy link
Member Author

pkgsCross.aarch64-multiplatform.nix on x86_64-linux passes.
aws-sdk-cpp.passthru.tests on aarch64-linux passes.

aws-sdk-cpp.passthru.tests fails on aarch64-darwin with a flaky error same error as in #340087 which occurs before this PR

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 9, 2024
@r-burns
Copy link
Contributor

r-burns commented Nov 10, 2024

Thanks for taking care of this update. Looks like it needs a merge conflict resolution, and while you're at it would you mind adding # nixpkgs-update: no auto update to all the packages so we don't need to keep fighting r-ryantm on these? #342725 (comment) Happy to do this myself if you don't have time at the moment.

@Artturin
Copy link
Member Author

I'll add, these are also out of date now

I have the updated 5 daya ago crt patch in awslabs/aws-crt-cpp#325 (comment)

@Artturin
Copy link
Member Author

But the news sdk update needs #350863 so I didn't update 5 days ago

@r-burns
Copy link
Contributor

r-burns commented Nov 10, 2024

Ok sounds good, just let me know when you need a review. And again, happy to help out with anything here.

@Artturin
Copy link
Member Author

Artturin commented Nov 15, 2024 •
edited
Loading

cherry-pick the s2n-tls update if you want to checkout this branch locally and build because the merge-base is staging master
git cherry-pick e65ff18e52b093cda46d922521778d1aea9e97c0

@Artturin
Copy link
Member Author

All aws-sdk-cpp.tests pass

@r-burns r-burns mentioned this pull request Nov 15, 2024
Draft
r-burns
r-burns reviewed Nov 16, 2024
View reviewed changes
Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

Looks good and downstream dependers such as Nix still build (with s2n-tls cherry-picked). Would be nice to add # nixpkgs-update: no auto update to these if you're up for it.

pkgs/by-name/aw/aws-c-common/package.nix
Copy link
Contributor

Choose a reason for hiding this comment

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

We can reenable the sba_metrics test on musl as it has been fixed upstream

@Artturin
aws-c-event-stream: 0.4.3 -> 0.5.0
40e546a 
Diff: https://www.github.com/awslabs/aws-c-event-stream/compare/v0.4.3...v0.5.0
@Artturin
aws-c-http: 0.8.2 -> 0.9.2
ed41231 
Diff: https://www.github.com/awslabs/aws-c-http/compare/v0.8.2...v0.9.2
@Artturin
aws-c-mqtt: 0.10.5 -> 0.11.0
00f5f8b 
Diff: https://www.github.com/awslabs/aws-c-mqtt/compare/v0.10.5...v0.11.0
@Artturin
aws-c-s3: 0.6.0 -> 0.7.1
38d503d 
Diff: https://www.github.com/awslabs/aws-c-s3/compare/v0.6.0...v0.7.1
@Artturin
aws-c-compression: 0.2.19 -> 0.3.0
4d26d41 
Diff: https://www.github.com/awslabs/aws-c-compression/compare/v0.2.19...v0.3.0
@Artturin
aws-c-io: 0.14.18 -> 0.15.3
be4d282 
Diff: https://www.github.com/awslabs/aws-c-io/compare/v0.14.18...v0.15.3
@Artturin
aws-checksums: 0.1.18 -> 0.2.2
61f9332 
Diff: https://www.github.com/awslabs/aws-checksums/compare/v0.1.18...v0.2.2
@Artturin
aws-c-sdkutils: 0.1.16 -> 0.2.1
c74b7e2 
Diff: https://www.github.com/awslabs/aws-c-sdkutils/compare/v0.1.16...v0.2.1
@Artturin
aws-c-cal: 0.6.15 -> 0.8.0
efe4939 
Diff: https://www.github.com/awslabs/aws-c-cal/compare/v0.6.15...v0.8.0
@Artturin
aws-crt-cpp: 0.29.4 -> 0.29.4
03d3d60 
Diff: https://www.github.com/awslabs/aws-crt-cpp/compare/v0.29.4...v0.29.4
@Artturin
aws-sdk-cpp: 1.11.448 -> 1.11.448
437dca6 
Diff: https://www.github.com/aws/aws-sdk-cpp/compare/1.11.448...1.11.448
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 16, 2024
@ofborg ofborg bot requested a review from r-burns November 16, 2024 07:31
@Artturin
aws-*: don't auto update
83c4a9c 
These should all be updated at the same time
@Artturin Artturin merged commit 535a417 into NixOS:staging Nov 19, 2024
24 checks passed
@Artturin Artturin deleted the awsupdates branch November 19, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@r-burns r-burns Awaiting requested review from r-burns

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Artturin @r-burns @wegank