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.

Sign up for GitHub

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

Jump to bottom

Fix detect-targets on Linux and add CI testing #1344

Merged
merged 24 commits into from
Sep 6, 2023
Merged

Fix detect-targets on Linux and add CI testing #1344

merged 24 commits into from
Sep 6, 2023

Conversation

NobodyXu
Copy link
Member

@NobodyXu NobodyXu commented Sep 3, 2023 •
edited

Fixed the bug introduced #1343

  • Fix linux::detect_targets: guess_host_triple could return gnu suffix on musl system, so always check that in detect_targets instead of using the target provided by guess_host_triple
  • Remove distro-specific targets since it breaks fallback to cargo
  • Fix linux::detect_targets on Alpine's gcompat version glibc
  • Fix linux::detect_targets on Ubuntu where glibc is stored in /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
  • Add testing for detect-targets
  • Add package.metadata.binstall for detect-targets

@NobodyXu NobodyXu marked this pull request as draft September 3, 2023 13:15
@NobodyXu
Testing: Add detect-targets/src/main.rs
dd49abc 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix detect-targets linux: guess_host_triple could return wrong li…
d8cd9d3 
…bc info

so it has to check it manually instead of simply providing alternatives
like other OSes.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix get_ld_flavor for Alpine's gcompat glibc
4ea77ee 
Its output is different from regular glibc, so we need to hardcode that
particular cases.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix detection of alpine specific musl target
aac25db 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add ci testing for Alpine
4aa964c 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add CI test for detect-targets on ubuntu
0a6b192 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor get_ld_flavor
ccff107 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix shellcheck
fd192b5 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add more CI test for ubuntu
00ef561 
and fixed typo in it

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Rm distro specific target as it breaks cargo-install fallback
b1e4ce4 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Make sure all binaries are built in CI
962aa73 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add package.metadata.binstall for detect-targets
82a741f 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix justfile
83e645c 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix detect-targets-{alpine, ubuntu}-test
cc4e61a 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix detect-targets-ubuntu-test
3bb83ca 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix debug-targets-ubuntu-test
31c4e74 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
set -exuo pipefail in detect-targets-ubuntu-test
c4c1c54 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Simplify detect-targets-*-test: Use Swatinem/rust-cache@v2 directly
990aa5f 
instead of using `just-setup`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Rm dup steps in detect-targets-ubuntu-test
0f4a7df 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add ls to detect-targets-alpine-test for debugging
0ad0856 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
FIx detect-targets-alpine-test
6270e7c 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix get_ld_flavor
9821121 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix linux::detect_targets on ubuntu & glibc system
5aedf63 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
FIx linux::detect_targets glibc checking
864f267 
Check dynlib suffix

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu marked this pull request as ready for review September 6, 2023 13:16
@NobodyXu NobodyXu added this pull request to the merge queue Sep 6, 2023
Merged via the queue into main with commit 76a6922 Sep 6, 2023
29 checks passed
@NobodyXu NobodyXu deleted the test/detect-targets branch September 6, 2023 14:53
@NobodyXu NobodyXu mentioned this pull request Sep 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@passcod passcod passcod approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@NobodyXu @passcod