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

build-aux/snap/local: cleanup patch and verification helper scripts #14901

Merged

Conversation

bboozzoo
Copy link
Contributor

@bboozzoo bboozzoo commented Jan 7, 2025

Improve the patching and verification scripts used during snap build.

Related: SNAPDENG-34352

@bboozzoo bboozzoo requested review from valentindavid and zyga January 7, 2025 09:14
Copy link

codecov bot commented Jan 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.23%. Comparing base (24a0034) to head (63a8188).
Report is 93 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #14901      +/-   ##
==========================================
+ Coverage   78.20%   78.23%   +0.02%     
==========================================
  Files        1151     1156       +5     
  Lines      151396   152851    +1455     
==========================================
+ Hits       118402   119579    +1177     
- Misses      25662    25891     +229     
- Partials     7332     7381      +49     
Flag Coverage Δ
unittests 78.23% <ø> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Copy link
Contributor

@zyga zyga left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@@ -524,4 +525,6 @@ parts:
<<:
- *dynamic-linker
override-prime: |
python3 "${CRAFT_PROJECT_DIR}/build-aux/snap/local/verify-dl.py" "${CRAFT_PRIME}" "/snap/snapd/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/${DYNAMIC_LINKER}" ";"
"${CRAFT_PROJECT_DIR}/build-aux/snap/local/verify-dl.py" \
"${CRAFT_PRIME}" \
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we could have taken the opportunity to read the environment variable if --prime is not passed like done in patch-dl.py. Just to make the command line smaller.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated the commit to account for this

@bboozzoo bboozzoo force-pushed the bboozzoo/improve-snap-build-helper-scripts branch from ecdb967 to 63a8188 Compare January 8, 2025 13:51
Improve the patching and verification scripts used during snap build.

Signed-off-by: Maciej Borzecki <[email protected]>
@bboozzoo bboozzoo force-pushed the bboozzoo/improve-snap-build-helper-scripts branch from 63a8188 to 360714b Compare January 9, 2025 13:36
@bboozzoo bboozzoo merged commit f9578f5 into canonical:master Jan 10, 2025
53 of 57 checks passed
@bboozzoo bboozzoo deleted the bboozzoo/improve-snap-build-helper-scripts branch January 10, 2025 08:12
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