From 0dd59a5f87527d523fa03cb92a478a5a9f7674ef Mon Sep 17 00:00:00 2001 From: Dawn <2439646234@qq.com> Date: Wed, 8 Jan 2025 09:39:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(renovate):=20:bug:=20=E4=BF=AE=E5=A4=8Dreno?= =?UTF-8?q?vate=20bot=E9=85=8D=E7=BD=AE=20(#164)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codecov.yml | 4 ++++ .github/workflows/codeql.yml | 5 +++++ .github/workflows/greetings.yml | 4 ++++ .github/workflows/pr-chatbot-review.yml | 4 ++++ .github/workflows/rust-clippy.yml | 5 +++++ renovate.json | 23 ++++++++++++++--------- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index ec9b5942..058a3fb8 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -9,6 +9,10 @@ on: jobs: codecov: + # 跳过 Renovate PR + if: | + github.actor != 'renovate[bot]' && + github.actor != 'renovate-preview[bot]' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 97dbfb4c..f461a8da 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -25,6 +25,11 @@ permissions: jobs: analyze: + # 跳过 Renovate PR + if: | + github.actor != 'renovate[bot]' && + github.actor != 'renovate-preview[bot]' + name: Analyze runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index c3f47b00..e08d2c46 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -4,6 +4,10 @@ on: [pull_request_target, issues] jobs: greeting: + # 跳过 Renovate PR + if: | + github.actor != 'renovate[bot]' && + github.actor != 'renovate-preview[bot]' runs-on: ubuntu-latest permissions: issues: write diff --git a/.github/workflows/pr-chatbot-review.yml b/.github/workflows/pr-chatbot-review.yml index 19dd3bd8..b41116d3 100644 --- a/.github/workflows/pr-chatbot-review.yml +++ b/.github/workflows/pr-chatbot-review.yml @@ -10,6 +10,10 @@ permissions: jobs: review: + # 跳过 Renovate PR + if: | + github.actor != 'renovate[bot]' && + github.actor != 'renovate-preview[bot]' runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml index 2212e9a0..8f28b484 100644 --- a/.github/workflows/rust-clippy.yml +++ b/.github/workflows/rust-clippy.yml @@ -18,6 +18,11 @@ on: jobs: rust-clippy-analyze: + # 跳过 Renovate PR + if: | + github.actor != 'renovate[bot]' && + github.actor != 'renovate-preview[bot]' + name: Run rust-clippy analyzing runs-on: ubuntu-latest permissions: diff --git a/renovate.json b/renovate.json index 8c511f66..108fd496 100644 --- a/renovate.json +++ b/renovate.json @@ -2,10 +2,8 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "automerge": false, "dependencyDashboard": true, - "baseBranches": ["update-rely"], - "automergeBaseBranch": "master", "ignoreDeps": [], - "labels": ["dependencies"], + "labels": ["dependencies", "skip-ci"], "postUpdateOptions": ["yarnDedupeHighest"], "prConcurrentLimit": 30, "prHourlyLimit": 4, @@ -18,24 +16,31 @@ }, "packageRules": [ { - "matchUpdateTypes": ["minor", "patch"] + "matchUpdateTypes": ["minor", "patch"], + "groupName": "non-major dependencies", + "groupSlug": "minor-patch-updates" }, { "groupName": "Tauri dependencies", - "groupSlug": "Tauri-deps", - "matchPackageNames": ["/@tauri-apps*/"] + "groupSlug": "tauri-deps", + "matchPackagePatterns": ["^@tauri-apps/"], + "matchManagers": ["npm"] }, { "groupName": "UnoCSS dependencies", - "groupSlug": "UnoCSS-deps", - "matchPackageNames": ["/@unocss*/"] + "groupSlug": "unocss-deps", + "matchPackagePatterns": ["^@unocss/"], + "matchManagers": ["npm"] }, { "description": "Rust crate updates", "matchManagers": ["cargo"], "groupName": "Rust dependencies", - "groupSlug": "rust-deps" + "groupSlug": "rust-deps", + "enabled": true, + "registryUrls": ["https://crates.io"] } ], + "enabledManagers": ["npm", "cargo"], "updateInternalDeps": true }