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

Fix: handle -- --target-dir arg in cargo build-sbf #33555

Merged
merged 4 commits into from
Oct 6, 2023

Conversation

stegaBOB
Copy link
Contributor

@stegaBOB stegaBOB commented Oct 6, 2023

Problem

Currently, extra args are allowed to pass through cargo build-sbf to cargo build. However, the --target-dir arg isn't being handled properly, and results in invalid file paths being used when target-dir is in play.

Summary of Changes

This PR intercepts --target-dir in the remaining args, canonicalizes it to fix issues with workspace relative paths, and adds it to the config to be used as the new target dir.

@mergify mergify bot added community Community contribution need:merge-assist labels Oct 6, 2023
@mergify mergify bot requested a review from a team October 6, 2023 00:40
dmakarov
dmakarov previously approved these changes Oct 6, 2023
@dmakarov dmakarov added the CI Pull Request is ready to enter CI label Oct 6, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Oct 6, 2023
@stegaBOB stegaBOB requested a review from dmakarov October 6, 2023 19:38
@dmakarov dmakarov added the CI Pull Request is ready to enter CI label Oct 6, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Oct 6, 2023
@codecov
Copy link

codecov bot commented Oct 6, 2023

Codecov Report

Merging #33555 (3b62f06) into master (6f1922b) will increase coverage by 0.0%.
Report is 13 commits behind head on master.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master   #33555   +/-   ##
=======================================
  Coverage    81.7%    81.7%           
=======================================
  Files         805      805           
  Lines      218162   218162           
=======================================
+ Hits       178410   178418    +8     
+ Misses      39752    39744    -8     

@dmakarov dmakarov merged commit 41ed9ab into solana-labs:master Oct 6, 2023
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community Community contribution need:merge-assist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants