From 57047b115625ae4e2b99964e2932418742cf20b3 Mon Sep 17 00:00:00 2001 From: ryanbas21 Date: Wed, 12 Feb 2025 18:37:02 -0700 Subject: [PATCH 1/2] chore: update-renovate-config --- renovate.json | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/renovate.json b/renovate.json index 999c3d87..11eebb02 100644 --- a/renovate.json +++ b/renovate.json @@ -9,11 +9,18 @@ "fileMatch": ["(^|/)(package\\.json)$"] }, "ignoreDeps": [ - "@nrwl/*", - "@nx/*", - "typescript", - "swc-loader", - "@swc/helpers" + "nx", + "@nx/devkit", + "@nx/eslint", + "@nx/eslint-plugin", + "@nx/jest", + "@nx/js", + "@nx/playwright", + "@nx/plugin", + "@nx/vite", + "@nx/web", + "@nx/workspace", + "typescript" ], "packageRules": [ { @@ -21,6 +28,30 @@ "matchDepTypes": ["devDependencies"], "automerge": true, "schedule": ["at 2:00am on Monday"] + }, + { + "matchPackageNames": ["effect", "@effect/*"], + "groupName": "effect-dependencies", + "automerge": true, + "schedule": ["at 2:00am on Monday"] + }, + { + "matchPackageNames": ["vitest", "@vitest/*", "vite"], + "groupName": "vite-vitest-dependencies", + "automerge": true, + "schedule": ["at 2:00am on Monday"] + }, + { + "matchPackageNames": ["typedoc", "typedoc-*"], + "groupName": "typedoc-dependencies", + "automerge": true, + "schedule": ["at 2:00am on Monday"] + }, + { + "matchPackageNames": ["@typescript-eslint/*"], + "groupName": "typescript-eslint-dependencies", + "automerge": true, + "schedule": ["at 2:00am on Monday"] } ] } From 7334a13b4f4afd48e034f9dfb63d727e0e964e41 Mon Sep 17 00:00:00 2001 From: ryanbas21 Date: Wed, 12 Feb 2025 18:54:31 -0700 Subject: [PATCH 2/2] chore: setup-renovate-changesets --- .github/workflows/changesets-renovate.yml | 28 ++++++++++++ renovate.json | 52 +++++++++++++++++++++-- 2 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/changesets-renovate.yml diff --git a/.github/workflows/changesets-renovate.yml b/.github/workflows/changesets-renovate.yml new file mode 100644 index 00000000..a38e7aa4 --- /dev/null +++ b/.github/workflows/changesets-renovate.yml @@ -0,0 +1,28 @@ +name: Generate changeset for Renovate + +on: + merge_group: + pull_request_target: + paths: + - '.github/workflows/changesets-renovate.yml' + - '**/pnpm-lock.yaml' + - '**/package.json' + +jobs: + generate-changeset: + runs-on: ubuntu-latest + if: github.actor == 'renovate[bot]' && github.repository == 'ForgeRock/ping-javascript-sdk' + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 2 + ref: ${{ github.head_ref }} + - name: Git Identity + run: | + git config --global user.name 'github-actions[bot]' + + - uses: pnpm/action-setup@v4.0.0 + + - name: Run changesets-renovate + run: pnpm dlx @scaleway/changesets-renovate diff --git a/renovate.json b/renovate.json index 11eebb02..0c55233b 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,17 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended"], + "extends": ["config:recommended", ":combinePatchMinorReleases"], "lockFileMaintenance": { "enabled": true, "automerge": true }, + "automerge": false, + "rebaseWhen": "auto", + "semanticCommitScope": "deps", + "semanticCommitType": "chore", + "prHourlyLimit": 5, + "prConcurrentLimit": 10, + "labels": ["dependencies"], "npm": { "fileMatch": ["(^|/)(package\\.json)$"] }, @@ -24,33 +31,70 @@ ], "packageRules": [ { - "matchUpdateTypes": ["minor", "patch"], - "matchDepTypes": ["devDependencies"], + "matchManagers": ["github-actions"], + "semanticCommitScope": "devDeps", "automerge": true, - "schedule": ["at 2:00am on Monday"] + "autoApprove": true + }, + { + "semanticCommitScope": "devDeps", + "matchDepTypes": ["packageManager", "devDependencies"], + "matchUpdateTypes": ["minor", "patch"] + }, + { + "minimumReleaseAge": "14 days", + "matchUpdateTypes": ["major"], + "automerge": false, + "autoApprove": true + }, + { + "labels": ["UPDATE-MINOR"], + "minimumReleaseAge": "7 days", + "matchUpdateTypes": ["minor"], + "automerge": true, + "autoApprove": true + }, + { + "labels": ["UPDATE-PATCH"], + "minimumReleaseAge": "3 days", + "matchUpdateTypes": ["patch"], + "automerge": true, + "autoApprove": true + }, + { + "matchDepTypes": ["engines"], + "rangeStrategy": "widen" }, { + "labels": ["effect"], "matchPackageNames": ["effect", "@effect/*"], "groupName": "effect-dependencies", "automerge": true, + "autoApprove": true, "schedule": ["at 2:00am on Monday"] }, { + "labels": ["vite", "vitest"], "matchPackageNames": ["vitest", "@vitest/*", "vite"], "groupName": "vite-vitest-dependencies", "automerge": true, + "autoApprove": true, "schedule": ["at 2:00am on Monday"] }, { + "labels": ["typedoc"], "matchPackageNames": ["typedoc", "typedoc-*"], "groupName": "typedoc-dependencies", "automerge": true, + "autoApprove": true, "schedule": ["at 2:00am on Monday"] }, { + "labels": ["@typescript-eslint"], "matchPackageNames": ["@typescript-eslint/*"], "groupName": "typescript-eslint-dependencies", "automerge": true, + "autoApprove": true, "schedule": ["at 2:00am on Monday"] } ]