Repository navigation
ci: build linux64_asan against system libraries instead of depends #8106
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,14 +23,35 @@ RUN set -ex; \ | |
| g++-x86-64-linux-gnu \ | ||
| gawk \ | ||
| gettext \ | ||
| libboost-dev \ | ||
| libqrencode-dev \ | ||
| libtool \ | ||
| m4 \ | ||
| pkg-config \ | ||
| qtbase5-dev \ | ||
| qttools5-dev \ | ||
| qttools5-dev-tools \ | ||
| systemtap-sdt-dev \ | ||
| wine-stable \ | ||
| wine64 \ | ||
| zip \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # No distribution packages blst, so builds that take their libraries from the | ||
| # system instead of depends (NO_DEPENDS=1) find it here. | ||
| # Keep the version in sync with depends/packages/blst.mk. | ||
| ARG BLST_VERSION=0.3.17 | ||
| ARG BLST_SHA256=c3fef37b566b67419703b2bbb648e15176276af9a880c22aa8f5f2e8cecc2e4d | ||
| RUN set -ex; \ | ||
| curl -fL "https://github.com/supranational/blst/archive/refs/tags/v${BLST_VERSION}.tar.gz" -o /tmp/blst.tar.gz; \ | ||
| echo "${BLST_SHA256} /tmp/blst.tar.gz" | sha256sum -c -; \ | ||
| mkdir /tmp/blst && tar -xzf /tmp/blst.tar.gz -C /tmp/blst --strip-components=1; \ | ||
| cd /tmp/blst; \ | ||
| CFLAGS="-O2 -fno-builtin -fPIC -D__BLST_PORTABLE__" ./build.sh; \ | ||
|
Comment on lines
+42
to
+50
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🟡 Suggestion: Guard the second blst pin against dependency drift The Dockerfile now independently records blst's version, checksum, and build flags, which already have an owner in depends/packages/blst.mk. These values match today, but the synchronization comment does not detect a later update made in only one location. That would silently make the system-library job exercise a different blst revision from depends-based builds. Add a lightweight consistency check for the duplicated version, checksum, and relevant flags, or derive them from shared metadata. The omitted no_asm_limbs.patch is not a current build defect: it affects BLST_NO_ASM, which this native amd64/arm64 installation does not select; document that intentional distinction rather than requiring identical patch application. source: |
||
| install -m 644 bindings/blst.h bindings/blst_aux.h /usr/local/include; \ | ||
| install -m 644 libblst.a /usr/local/lib; \ | ||
| cd / && rm -rf /tmp/blst /tmp/blst.tar.gz | ||
|
Comment on lines
+40
to
+53
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @thepastaclaw please make an issue tracking this; we want to move blst into a git subtree or similiar to avoid this type of issue
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Tracking issue opened: #8144. It covers moving blst into a git subtree or equivalent repository-owned shared source so the depends build and system-library CI image no longer maintain independent pins. |
||
|
|
||
| # Native g++-11 already provides aarch64-linux-gnu-g++-11 on arm64, where noble | ||
| # has no g++-11-aarch64-linux-gnu cross package | ||
| RUN set -ex; \ | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔴 Blocking: Honor NO_DEPENDS in test-time library selection
Enabling NO_DEPENDS switches compilation to system libraries, but ci/dash/test_unittests.sh:20 still unconditionally exports LD_LIBRARY_PATH="$DEPENDS_DIR/$HOST/lib". When that prefix exists, the system Qt dependency chain loads depends' older FreeType instead of the distribution library. This is confirmed in ASan job 130393139752: at 08:22:27 it exports the depends library path, and at 08:23:25 test_dash-qt fails with
/lib/x86_64-linux-gnu/libharfbuzz.so.0: undefined symbol: FT_Get_Color_Glyph_ClipBox, exiting 127 and failing the job. The pull_request_target workflow still reconstructs depends from the base workflow while checking out this head's scripts; an existing local prefix creates the same problem. Guard the unit-test runtime override with NO_DEPENDS, and update both the export at ci/dash/test_integrationtests.sh:21 and its inline assignment at line 52. System-library tests must not depend on the depends prefix being absent.source:
gpt-6.1-sol(phase2-reviewer: general, dash-core-commit-history); fresh:generalThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved (re-reviewed at
adfd4af1): The new NO_DEPENDS guards in both test scripts preserve the normal library-search environment for the system build, and removing the functional runner's unconditional override closes the remaining assignment. Depends-backed jobs retain their previous exported library path.