') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); fix: disable cache-bin in rust-cache to fix macos-15 cargo by prql-bot · Pull Request #5897 · PRQL/prql · GitHub
Skip to content

fix: disable cache-bin in rust-cache to fix macos-15 cargo - #5897

Merged
max-sixty merged 2 commits into
mainfrom
fix/ci-25882534028
May 14, 2026
Merged

fix: disable cache-bin in rust-cache to fix macos-15 cargo#5897
max-sixty merged 2 commits into
mainfrom
fix/ci-25882534028

Conversation

@prql-bot

@prql-botprql-bot commented May 14, 2026

Copy link
Copy Markdown
Collaborator

Problem

The tests workflow on main has been failing on the macos-15, aarch64-apple-darwin matrix legs (run 25882534028, and earlier run 25867121979 closed as transient in #5886). Same shape both times — after Swatinem/rust-cache@v2 restores its cache, /Users/runner/.cargo/bin/cargo resolves to rustup-init (the installer) instead of the rustup proxy, so every subsequent cargo invocation dies with:

error: error: unexpected argument 'build' found
Usage: rustup-init[EXE] [OPTIONS]

Root cause is upstream and not transient: Swatinem/rust-cache#341 ("cache-bin: true breaks cargo subcommands on new github macos runner"), filed 2026-05-13 against a new macos-15 runner image rollout (actions/runner-images#14037). The fix the upstream issue documents is cache-bin: "false".

Solution

Set cache-bin: "false" on every Swatinem/rust-cache@v2 invocation in the repo (11 sites across workflows and composite actions). This stops ~/.cargo/bin/ from being restored from cache, so the rustup-managed cargo/rustc symlinks installed by the prior rustup target add step survive intact.

This loses nothing in practice — none of our workflows install cargo subcommands to ~/.cargo/bin/. baptiste0928/cargo-install already uses a custom root (/Users/runner/.cargo-install/...) with its own cache, so cargo-insta, cargo-nextest, wasm-pack, mdbook, etc. are unaffected.

Applying it everywhere (not just the failing macos legs) keeps the configuration consistent and protects the Linux/Windows legs from the same issue if the bug surfaces on other runner images.

Testing

Can't reproduce locally (the bug needs a macos-15 runner). The fix is the workaround documented in the upstream issue, and matches what the reporter confirmed unblocked their jobs. CI on this PR will verify the macos legs pass.

Automated fix for failed run 25882534028.

prql-botand others added 2 commits May 14, 2026 20:26
@prql-bot@claude
fix: disable cache-bin in rust-cache to fix macos-15 cargo
72ec4bf
The new macos-15 runner image causes Swatinem/rust-cache@v2 to restore
a corrupted ~/.cargo/bin/cargo (resolves to rustup-init instead of the
rustup proxy), breaking every subsequent cargo invocation with
'error: unexpected argument <subcommand> found / Usage: rustup-init'.
Upstream-tracked at Swatinem/rust-cache#341
with the workaround being cache-bin: false. Apply it to every
rust-cache invocation in the repo so the bin directory is never
restored from cache.
Co-Authored-By: Claude <noreply@anthropic.com>
@prql-bot@claude
fix: also disable cache-bin in remaining tests.yaml jobs
99840ba
Three ubuntu-24.04 rust-cache sites in tests.yaml were missed in the
initial pass (check-links-book, measure-code-cov, test-deps-min-versions).
The bug currently only fires on macos-15, but the PR's stated intent is
to disable cache-bin everywhere for consistency.
Co-Authored-By: Claude <noreply@anthropic.com>
@prql-bot

prql-bot commented May 14, 2026

Copy link
Copy Markdown
CollaboratorAuthor

The same failure recurred on the next push to main: run 25886221899 on commit 815cbd1 — identical shape on build-prqlc-c (macos-15, aarch64-apple-darwin, default,test-dbs), cargo resolving to rustup-init after the rust-cache restore. Just bumping the failure count, no other action needed — this PR's fix still applies as-is.

@max-sixty
max-sixty merged commit 793913b into mainMay 14, 2026
78 checks passed
@max-sixty
max-sixty deleted the fix/ci-25882534028 branch May 14, 2026 23:01
This was referenced May 15, 2026
Closed
Closed
Closed
This was referenced Aug 5, 2026
Closed
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@prql-bot@max-sixty