From 068af7d09bae061dc59736cedcfdb38eff666676 Mon Sep 17 00:00:00 2001 From: Aaron Moat <2937187+AaronMoat@users.noreply.github.com> Date: Sun, 13 Oct 2024 11:46:28 +1100 Subject: [PATCH] Restore gitIgnoredAuthors I reverted this in https://github.com/seek-oss/rynovate/pull/125 because I was noticing an autofix-rebase loop with a skuba upgrade. I have traced this down to skuba's upgrade changing Docker images. I'm a little confused on the details, but Renovate then decided the branch was out of date because there were new dependencies to update. I believe that restoring skuba to be in its own PR will bypass this issue. --- default.json | 5 ++++- non-critical.json | 7 +++++-- package.json | 3 ++- third-party-major.json | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/default.json b/default.json index 63cd955..7089e1a 100644 --- a/default.json +++ b/default.json @@ -278,7 +278,10 @@ "branchConcurrentLimit": null, "branchPrefix": "renovate-", "commitMessageAction": "", - "gitIgnoredAuthors": [], + "gitIgnoredAuthors": [ + "34733141+seek-oss-ci@users.noreply.github.com", + "87109344+buildagencygitapitoken[bot]@users.noreply.github.com" + ], "postUpdateOptions": ["yarnDedupeFewer", "pnpmDedupe"], "prConcurrentLimit": 3, "prNotPendingHours": 1, diff --git a/non-critical.json b/non-critical.json index 190051a..b5f40ef 100644 --- a/non-critical.json +++ b/non-critical.json @@ -55,7 +55,7 @@ "allowedVersions": "!/^(3\\.42\\.0|4\\.21\\.0)$/" }, { - "excludePackageNames": ["seek-jobs/gantry", "seek-jobs/automat"], + "excludePackageNames": ["seek-jobs/gantry", "seek-jobs/automat", "skuba"], "matchUpdateTypes": [ "bump", "digest", @@ -86,7 +86,10 @@ "buildkite": { "additionalBranchPrefix": "", "commitMessageExtra": "" }, "commitMessageAction": "", "commitMessageExtra": "", - "gitIgnoredAuthors": [], + "gitIgnoredAuthors": [ + "34733141+seek-oss-ci@users.noreply.github.com", + "87109344+buildagencygitapitoken[bot]@users.noreply.github.com" + ], "postUpdateOptions": ["yarnDedupeFewer", "pnpmDedupe"], "prConcurrentLimit": 2, "prNotPendingHours": 1, diff --git a/package.json b/package.json index 9cb3c6e..b5f0976 100644 --- a/package.json +++ b/package.json @@ -17,5 +17,6 @@ "test:default": "RENOVATE_CONFIG_FILE=default.json renovate-config-validator", "test:non-critical": "RENOVATE_CONFIG_FILE=non-critical.json renovate-config-validator", "test:third-party-major": "RENOVATE_CONFIG_FILE=third-party-major.json renovate-config-validator" - } + }, + "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610" } diff --git a/third-party-major.json b/third-party-major.json index 24294e0..ad0478c 100644 --- a/third-party-major.json +++ b/third-party-major.json @@ -143,7 +143,10 @@ } ], "commitMessageAction": "", - "gitIgnoredAuthors": [], + "gitIgnoredAuthors": [ + "34733141+seek-oss-ci@users.noreply.github.com", + "87109344+buildagencygitapitoken[bot]@users.noreply.github.com" + ], "postUpdateOptions": ["yarnDedupeFewer", "pnpmDedupe"], "prConcurrentLimit": 3, "prNotPendingHours": 1,