Skip to content

ci: Select cuttlefish by target instead of a matrix env - #5316

Merged
tgross35 merged 1 commit into
rust-lang:mainfrom
10ne1:ci-cuttlefish-by-target
Jul 23, 2026
Merged

ci: Select cuttlefish by target instead of a matrix env#5316
tgross35 merged 1 commit into
rust-lang:mainfrom
10ne1:ci-cuttlefish-by-target

Conversation

@10ne1

@10ne1 10ne1 commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Description:

This is a tiny follow-up to #5269 at @tgross35's request: drop the TEST_CUTTLEFISH=1 matrix env and select Cuttlefish by matching x86_64-linux-android in run-docker.sh, like the existing musl/aarch64 target checks.

A libc-0.2 backport might be desired to get the new Android CI infra there as well, but I'll leave it up to the maintainers / reviewers to decide.

Sources

No library/API changes; this is test-harness and CI-only.

Checklist

CI-only change: no src/ or libc-test/semver modifications.

  • Relevant tests in libc-test/semver have been updated (N/A)
  • No placeholder or unstable values (N/A)
  • Tested: validated in my fork on GitHub-hosted runners. This PR's own CI run exercises it directly.

AI disclosure

This PR was written with the help of Claude Code, but was not vibe-coded. I'm not a fan of vibe-coding.

I used AI to better understand the codebase myself (asked it a lot of questions), review both my code and any code generated by AI, used it especially to detect bugs and corner-cases and suggest fixes, however I very carefully reviewed & edited each code/comment lines, the commit messages and so on, until I was satisfied with the result.

Even this PR description was written entirely by myself and only reviewed by AI for errors.

The x86_64-linux-android job set TEST_CUTTLEFISH=1 in the workflow
matrix just so run-docker.sh could tell it apart.

Match on the target name instead, like the existing musl and
aarch64-linux-android checks, so the CI matrix carries no magic env
and running the job locally needs no special variable.

Suggested-by: Trevor Gross <tg@trevorgross.com>
Assisted-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
@rustbot rustbot added the A-CI Area: CI-related items label Jul 22, 2026
@10ne1
10ne1 marked this pull request as ready for review July 22, 2026 15:43

@tgross35 tgross35 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@tgross35
tgross35 enabled auto-merge July 23, 2026 18:20
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Jul 23, 2026
@tgross35
tgross35 added this pull request to the merge queue Jul 23, 2026
Merged via the queue into rust-lang:main with commit aa2e589 Jul 23, 2026
84 of 113 checks passed
@tgross35 tgross35 mentioned this pull request Aug 31, 2026
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Aug 31, 2026
tgross35 pushed a commit to dybucc/libc that referenced this pull request Aug 31, 2026
The x86_64-linux-android job set TEST_CUTTLEFISH=1 in the workflow
matrix just so run-docker.sh could tell it apart.

Match on the target name instead, like the existing musl and
aarch64-linux-android checks, so the CI matrix carries no magic env
and running the job locally needs no special variable.

Suggested-by: Trevor Gross <tg@trevorgross.com>
Assisted-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>

(backport <rust-lang#5316>)
(cherry picked from commit aa2e589)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: CI-related items stable-applied This PR has been cherry-picked to libc's stable release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants