Skip to content

CI, production Docker, and hardening fixes (rebased on upstream main) - #5602

Open
AayushBehera wants to merge 1 commit into
Aider-AI:mainfrom
AayushBehera:contribution
Open

CI, production Docker, and hardening fixes (rebased on upstream main)#5602
AayushBehera wants to merge 1 commit into
Aider-AI:mainfrom
AayushBehera:contribution

Conversation

@AayushBehera

Copy link
Copy Markdown

Upstream Reconciliation Complete — Merge-Safe PR

The project has been successfully rebuilt on the current upstream main branch and the feature branch now shares history with upstream.

Included

CI/CD

  • Reworked ubuntu-tests.yml
  • Added docker-build-test.yml for container smoke testing
  • Added integration-tests.yml

Docker / Deployment

  • Hardened Dockerfile
  • Added .dockerignore
  • Added docker-compose.yml
  • Added docker/README.md

Compatibility and Reliability Fixes

  • Improved aider/repo.py to safely skip commits with missing messages
  • Hardened version-guard logic in aider/utils.py
  • Added compatible package metadata updates in aider/coders/__init__.py
  • Updated pytest.ini and .gitignore

Tests

Updated and extended compatibility coverage across:

  • repository handling
  • main application flow
  • onboarding
  • OpenRouter
  • SendChat
  • AWS credentials
  • SSL verification
  • voice
  • scraping
  • shared test configuration

Intentionally Excluded

The previous custom modules:

  • aider/diagnostics.py
  • aider/context_budget.py

were excluded because they no longer exist in the current upstream architecture, and retaining their dependent imports would break the current Aider codebase.

Their dependent tests were therefore also excluded.

Previously requested dead-code-file deletions were not applied where doing so would conflict with upstream structure.

Result

The contribution branch has been rebuilt against the current upstream main.

The resulting PR now contains only the CI/CD, Docker, testing, and compatibility-hardening work, with the previous structural divergence removed.

Merge status: merge-clean with no known upstream conflicts.

@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.


Aayush Behera seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@AayushBehera
AayushBehera marked this pull request as draft August 20, 2026 18:55
@AayushBehera
AayushBehera marked this pull request as ready for review August 20, 2026 18:55
@AayushBehera
AayushBehera marked this pull request as draft August 20, 2026 18:55
@AayushBehera
AayushBehera marked this pull request as ready for review August 20, 2026 18:56
@AayushBehera

Copy link
Copy Markdown
Author

aider

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.

2 participants