diff --git a/.github/renovate.json b/.github/renovate.json index 2964a8dd..29b14805 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,9 +2,6 @@ "labels": [ "dependencies" ], - "lockFileMaintenance": { - "enabled": true - }, "rangeStrategy": "widen", "dependencyDashboard": true, "automerge": true, diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 7d54ba83..2ec8a407 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -45,7 +45,7 @@ jobs: fi - name: pre-commit (PEP 735) if: steps.detect.outputs.method == 'pep735' - run: uv run --only-group pre-commit pre-commit run --all + run: uv run --no-sources --only-group pre-commit pre-commit run --all env: RUFF_OUTPUT_FORMAT: github REUSE_OUTPUT_FORMAT: github diff --git a/.github/workflows/pull_requests.yaml b/.github/workflows/pull_requests.yaml index 73e4de10..524ca950 100644 --- a/.github/workflows/pull_requests.yaml +++ b/.github/workflows/pull_requests.yaml @@ -22,7 +22,7 @@ jobs: name: Weblate automerge if: github.actor == 'weblate' steps: - - uses: peter-evans/enable-pull-request-automerge@v3 - with: - pull-request-number: ${{ github.event.pull_request.number }} - merge-method: rebase + - name: Enable Pull Request Automerge + run: gh pr merge --merge --auto "${{ github.event.pull_request.number }}" + env: + GH_TOKEN: ${{ secrets.WEBLATE_CI_TOKEN }}