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

treewide: Rust updates [backport 2024.01] #20384

Merged

Conversation

MrKevinWeiss
Copy link
Contributor

Backport of #20303

Contribution description

This PR does three things that are easiest done in one go (because due to git dependencies otherwise it would require selective updates):

Testing procedure

  • CI completes
  • Run saul on microbit-v2, reading sensors 7 and 8
  • Run rust-gcoap on native, test with aiocoap-client 'coap://[fe80::3c63:beff:fe85:ca96%tapbr0]/vfs/'

Issues/PRs references

Based on #20299

@MrKevinWeiss MrKevinWeiss added Area: cpu Area: CPU/MCU ports Area: drivers Area: Device drivers Area: examples Area: Example Applications Area: Rust Area: Rust wrapper Area: sys Area: System Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Feb 13, 2024
@MrKevinWeiss MrKevinWeiss requested a review from chrysn February 13, 2024 11:57
@riot-ci
Copy link

riot-ci commented Feb 13, 2024

Murdock results

✔️ PASSED

4b294e9 treewide: cargo update

Success Failures Total Runtime
8613 0 8613 10m:52s

Artifacts

@chrysn
Copy link
Member

chrysn commented Feb 13, 2024

That auto-backport didn't do what it should have done because GitHub doesn't understand stacked PRs; it should only consist of MrKevinWeiss@002cd42.

I don't yet understand why the CI fails, may be related.

@chrysn
Copy link
Member

chrysn commented Feb 13, 2024

Correction: It should just be the top 4 commits (as we're backporting the full PR). Only the first slid in from #20299 and should not be in unless we backport #20299 too (which is probably a good fix to have but then is more than is necessary to fix the issue at hand). The later commits ("use version 0.3", "use version 1.0", "update to coap-handler" and the "cargo update" due to which we're doing this) don't depend on the 20299 one fundamentally, they just are testable much more easily once that older one is in.

@MrKevinWeiss MrKevinWeiss force-pushed the backport/2024.01/rust-updates branch from 11d6ea8 to 6068cfb Compare February 20, 2024 09:25
@github-actions github-actions bot removed Platform: ARM Platform: This PR/issue effects ARM-based platforms Area: drivers Area: Device drivers Area: cpu Area: CPU/MCU ports labels Feb 20, 2024
@MrKevinWeiss
Copy link
Contributor Author

I am not quite sure what you wanted, I have just the cargo update. Should I have "use version 0.3", "use version 1.0", "update to coap-handler" and the "cargo update" or should it have been only the 790e808?

@MrKevinWeiss
Copy link
Contributor Author

Or is it everything but 790e808...

Note that for the very CPU this driver is used with (nRF52 on the
microbit-v2 board), this currently needs extra workarounds to copy
written data from flash to RAM so that the driver can see it. (Otherwise
it silently writes 00, and then correctly reads 00 from the bus all the
time).

(cherry picked from commit 96af920)
(cherry picked from commit 002cd42)
@MrKevinWeiss MrKevinWeiss force-pushed the backport/2024.01/rust-updates branch from 6068cfb to 4b294e9 Compare February 20, 2024 09:32
@github-actions github-actions bot added the Area: drivers Area: Device drivers label Feb 20, 2024
@MrKevinWeiss
Copy link
Contributor Author

I repushed with my best guess.

Copy link
Member

@chrysn chrysn left a comment

Choose a reason for hiding this comment

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

Thanks, your best guess matches mine.

@chrysn chrysn enabled auto-merge February 20, 2024 10:47
@chrysn chrysn disabled auto-merge February 20, 2024 11:08
@maribu
Copy link
Member

maribu commented Feb 20, 2024

#20383 needs to be merged first, otherwise the CI will fail

@maribu maribu added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Feb 20, 2024
@Teufelchen1 Teufelchen1 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Mar 25, 2024
@benpicco benpicco added this pull request to the merge queue Apr 15, 2024
Merged via the queue into RIOT-OS:2024.01-branch with commit 87a984b Apr 16, 2024
30 checks passed
@MrKevinWeiss MrKevinWeiss deleted the backport/2024.01/rust-updates branch June 21, 2024 07:02
@mguetschow mguetschow added this to the Release 2024.07 milestone Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: drivers Area: Device drivers Area: examples Area: Example Applications Area: Rust Area: Rust wrapper Area: sys Area: System Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants