diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 98f0ebe..f878f1a 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -28,4 +28,3 @@ jobs: env: LOG_LEVEL: debug RENOVATE_REPOSITORIES: ${{ github.repository }} - MEND_RNV_MC_TOKEN: ${{ secrets.MEND_RNV_MC_TOKEN }} diff --git a/README.md b/README.md index bb915aa..f67341a 100644 --- a/README.md +++ b/README.md @@ -124,11 +124,8 @@ This repo now uses Renovate to auto-update dependencies (including template mani 2. Use a fine-grained GitHub token scoped to this repository with: - Contents: Read and write - Pull requests: Read and write -3. Create a repository secret named `MEND_RNV_MC_TOKEN` (Merge Confidence API token) so confidence-based PR gating can work. -4. Enable repository auto-merge in GitHub settings. -5. Protect `master`, require CI checks before merge, and enable merge queue. - -If `MEND_RNV_MC_TOKEN` is not configured, updates remain in the dependency dashboard for manual approval. +3. Enable repository auto-merge in GitHub settings. +4. Protect `master`, require CI checks before merge, and enable merge queue. Why: PRs created with `GITHUB_TOKEN` do not trigger downstream `pull_request` workflows. Using `RENOVATE_TOKEN` ensures CI checks run and automerge can complete. diff --git a/renovate.json b/renovate.json index 13f7123..a2a06ce 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended", "mergeConfidence:age-confidence-badges"], + "extends": ["config:recommended"], "labels": ["dependencies"], "rangeStrategy": "bump", "ignoreUnstable": true, @@ -192,31 +192,6 @@ "automerge": true, "automergeType": "pr", "platformAutomerge": true - }, - { - "description": "Automerge lock file maintenance updates", - "matchUpdateTypes": ["lockFileMaintenance"], - "dependencyDashboardApproval": false, - "automerge": true, - "automergeType": "pr", - "platformAutomerge": true - }, - { - "description": "Automerge high-confidence major npm updates", - "matchDatasources": ["npm"], - "matchUpdateTypes": ["major"], - "matchConfidence": ["high", "very high"], - "dependencyDashboardApproval": false, - "automerge": true, - "automergeType": "pr", - "platformAutomerge": true - }, - { - "description": "Keep low/neutral confidence npm updates in dashboard for manual approval", - "matchDatasources": ["npm"], - "matchConfidence": ["low", "neutral"], - "dependencyDashboardApproval": true, - "automerge": false } ] }