Skip to content

fix(ci): invoke Compose v2 during workspace cleanup - #6041

Merged
renecannao merged 1 commit into
GH-Actionsfrom
fix/ci-compose-v2
Aug 12, 2026
Merged

fix(ci): invoke Compose v2 during workspace cleanup#6041
renecannao merged 1 commit into
GH-Actionsfrom
fix/ci-compose-v2

Conversation

@renecannao

@renecannao renecannao commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Summary

Use docker compose in 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-compose binary. 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

  • Parsed .github/workflows/ci-builds.yml
  • Syntax-checked both cleanup shell scripts
  • Executed both extracted cleanup scripts against a mocked Compose-v2 docker command for the Debian 12, Ubuntu 22, and Ubuntu 24 projects

Summary by cubic

Switch CI workspace cleanup to Compose v2 by invoking docker compose instead of the legacy docker-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.

Review in cubic

Summary by CodeRabbit

  • Chores
    • Updated self-hosted build cleanup commands to use the current Docker Compose CLI.
    • Cleanup behavior and error handling remain unchanged.

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.
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 52cb6424-20b8-47f1-8e0f-599138cf7ae0

📥 Commits

Reviewing files that changed from the base of the PR and between f084b3d and e976aaf.

📒 Files selected for processing (1)
  • .github/workflows/ci-builds.yml
📜 Recent review details
🔇 Additional comments (1)
.github/workflows/ci-builds.yml (1)

179-179: LGTM!

Also applies to: 703-703


📝 Walkthrough

Walkthrough

The CI workflow replaces both legacy docker-compose cleanup calls with docker compose. Volume removal, orphan removal, and failure handling remain unchanged.

Changes

Docker Compose cleanup

Layer / File(s) Summary
Update self-hosted cleanup commands
.github/workflows/ci-builds.yml
The pre-build stale project cleanup and final teardown now use docker compose. Existing cleanup options and failure handling remain unchanged.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Possibly related PRs

Poem

A rabbit hops through workflow lanes,
Where Compose sheds its older chains.
Two cleanup calls now speak anew,
With volumes and orphans handled too.
No failure flags are left behind—
Fresh Docker commands, neat and kind.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the CI cleanup change to use Docker Compose v2 and matches the main pull request objective.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/ci-compose-v2

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@gitar-bot

gitar-bot Bot commented Aug 12, 2026

Copy link
Copy Markdown
Code Review ✅ Approved

Switches CI workspace cleanup to use Docker Compose v2, fixing missing binary errors on self-hosted runners. No issues found.

Options

Auto-apply is off → Gitar will not commit updates to this branch.
Display: compact → Showing less information.

Comment with these commands to change the behavior for this request:

Auto-apply Compact
gitar auto-apply:on         
gitar display:verbose         

Was this helpful? React with 👍 / 👎 | Gitar

@renecannao
renecannao marked this pull request as ready for review August 12, 2026 05:44
@renecannao
renecannao merged commit b16ff81 into GH-Actions Aug 12, 2026
2 checks passed
@sonarqubecloud

Copy link
Copy Markdown

renecannao added a commit that referenced this pull request Aug 12, 2026
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant