diff --git a/.github/workflows/aider-common.yml b/.github/workflows/aider-common.yml index e7aed91426..935c4224f2 100644 --- a/.github/workflows/aider-common.yml +++ b/.github/workflows/aider-common.yml @@ -119,7 +119,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.11" - name: Cache Python dependencies uses: actions/cache@v3 @@ -129,27 +129,18 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Cache Aider installation - id: cache-aider - uses: actions/cache@v3 - with: - path: ~/.local/bin/aider - key: ${{ runner.os }}-aider-install-${{ hashFiles('**/requirements.txt', '**/setup.py') }} - restore-keys: | - ${{ runner.os }}-aider-install- - - name: Install Aider and Dependencies run: | - if [ -f ~/.local/bin/aider ] && [ -x ~/.local/bin/aider ]; then - echo "Using cached Aider installation" - export PATH="$HOME/.local/bin:$PATH" - else - echo "Installing Aider..." - python -m pip install aider-install; aider-install - fi - pip install -U google-generativeai + echo "Installing Aider..." + python -m pip install uv + python -m venv ~/uv-env + source ~/uv-env/bin/activate + uv pip install configargparse==1.7 + uv pip install aider-chat==0.83.1 + uv pip install -U google-generativeai sudo apt-get update && sudo apt-get install -y jq echo "$HOME/.local/bin" >> $GITHUB_PATH + echo "VIRTUAL_ENV_PATH=$HOME/uv-env" >> $GITHUB_ENV - name: Create Prompt for Aider id: create_prompt @@ -305,7 +296,7 @@ jobs: FINAL_PROMPT: ${{ steps.create_prompt.outputs.final_prompt }} RULES_FILES: ${{ inputs.rules_files }} run: | - + source $VIRTUAL_ENV_PATH/bin/activate echo "$FINAL_PROMPT" > .aider_final_prompt.txt echo "FILES_TO_EDIT: $FILES_TO_EDIT"