fix(ci): invoke Compose v2 during workspace cleanup - #6041
Conversation
The self-hosted CI VMs provide Docker Compose through the Docker CLI plugin, `docker compose`, and do not install the legacy standalone `docker-compose` executable. The cleanup loops added in #6040 therefore failed after a successful build or before checkout when a previous checkout was present. Use the same Compose v2 invocation already used by the Makefile in both the pre-build and post-build cleanup loops. The project-label fallback, aggregate cleanup errors, and ownership repair behavior remain unchanged.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
📜 Recent review details🔇 Additional comments (1)
📝 WalkthroughWalkthroughThe CI workflow replaces both legacy ChangesDocker Compose cleanup
Estimated code review effort: 1 (Trivial) | ~2 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Code Review ✅ ApprovedSwitches CI workspace cleanup to use Docker Compose v2, fixing missing binary errors on self-hosted runners. No issues found. OptionsAuto-apply is off → Gitar will not commit updates to this branch. Comment with these commands to change the behavior for this request:
Was this helpful? React with 👍 / 👎 | Gitar |
|
The prior #6038 CI-builds run used the cleanup from #6040, which invoked the unavailable standalone docker-compose executable. Its Debian build completed but failed in post-build cleanup, and the Ubuntu 24 leg failed during pre-build cleanup. PR #6041 is now merged into GH-Actions and switches both cleanup loops to Docker Compose v2. This empty commit changes no ProxySQL source; it triggers #6038 again so the corrected reusable workflow is exercised on the self-hosted runners.



Summary
Use
docker composein the pre-build and post-build self-hosted workspace cleanup loops.Root cause
The CI VMs provide Compose v2 through the Docker CLI plugin but do not have the legacy standalone
docker-composebinary. The cleanup added by #6040 therefore failed before checkout when a stale checkout existed, or after an otherwise successful build.Impact
Both cleanup loops now use the same Compose interface as the repository Makefile. Project-label fallback removal, ownership repair, and aggregate cleanup-error behavior are unchanged.
Validation
.github/workflows/ci-builds.ymldockercommand for the Debian 12, Ubuntu 22, and Ubuntu 24 projectsSummary by cubic
Switch CI workspace cleanup to Compose v2 by invoking
docker composeinstead of the legacydocker-compose, fixing failures on self-hosted runners. This aligns pre- and post-build cleanup with the Makefile; no changes to labels, ownership repair, or error handling.Written for commit e976aaf. Summary will update on new commits.
Summary by CodeRabbit