Skip to content

v2.2: Bump platform tools version (backport of #5267)#5275

Merged
t-nelson merged 1 commit intov2.2from
mergify/bp/v2.2/pr-5267
Mar 14, 2025
Merged

v2.2: Bump platform tools version (backport of #5267)#5275
t-nelson merged 1 commit intov2.2from
mergify/bp/v2.2/pr-5267

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Mar 13, 2025

Problem

Platform tools version v1.44 caused a regression on the build pipeline used in cargo-build-sbf, whereby the llvm-objcopy command run after the build would create invalid binary file for our ELF loader.

This problem was undetected because #1581 removed all integration tests with cargo-build-sbf. Since it was merged, we do not build and test any program with cargo-build-sbf in the CI.

Summary of Changes

The new version fixes the issue and reduces program size for SBPFv2 and SBPFv3.

PS: I'll add sanity tests for cargo-build-sbf to the CI in a follow up PR.


This is an automatic backport of pull request #5267 done by [Mergify](https://mergify.com).

@mergify mergify Bot requested a review from a team as a code owner March 13, 2025 14:06
@mergify mergify Bot added the conflicts label Mar 13, 2025
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 13, 2025

Cherry-pick of 36d706c has failed:

On branch mergify/bp/v2.2/pr-5267
Your branch is up to date with 'origin/v2.2'.

You are currently cherry-picking commit 36d706c8d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   platform-tools-sdk/cargo-build-sbf/src/main.rs
	modified:   platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
	modified:   platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml
	modified:   platform-tools-sdk/sbf/scripts/install.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/sbf/tests/programs.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@LucasSte LucasSte closed this Mar 13, 2025
@LucasSte LucasSte force-pushed the mergify/bp/v2.2/pr-5267 branch from 0e74422 to c8c9a6b Compare March 13, 2025 14:12
@LucasSte LucasSte reopened this Mar 13, 2025
@LucasSte LucasSte requested a review from Lichtso March 13, 2025 15:39
@t-nelson t-nelson merged commit fe70d33 into v2.2 Mar 14, 2025
@t-nelson t-nelson deleted the mergify/bp/v2.2/pr-5267 branch March 14, 2025 19:23
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.

3 participants