From 65a0dff25829841cfd0b713a4766c0e50d1f982a Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Mon, 18 Nov 2024 14:23:20 +0000 Subject: [PATCH 1/3] update config --- .github/dependabot.yml | 54 +++++++++++++++++++++++++++ .github/workflows/ci.yml | 19 ++++++++-- .github/workflows/dangerjs-checks.yml | 2 +- README.md | 3 -- dangerfile.js | 5 +-- 5 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..45c5aca2d0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,54 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + ignore: + - dependency-type: "major" + open-pull-requests-limit: 3 + commit-message: + prefix: "DSW-000 update" + groups: + babel: + description: "Group Babel devDependencies from package.json within pie-monorepo" + patterns: + - "@babel/*" + - "babel-*" + justeattakeaway: + description: "Group JET devDependencies / dependencies from package.json within pie-monorepo" + patterns: + - "@justeat/*" + - "@justeattakeaway/*" + percy: + description: "Group Playwright / other testing related devDependencies from package.json within pie-monorepo" + patterns: + - "@axe-core/playwright" + - "@percy/*" + - "@playwright/*" + - "@sand4rt/experimental-ct-web/*" + vitest: + description: "Group Vitest devDependencies from package.json within pie-monorepo" + patterns: + - "vitest-*" + - "@vitest" + eleventy: + description: "Group Eleventy devDependencies from apps/pie-docs/package.json" + patterns: + - "@11ty/*" + - "eleventy-*" + storybook: + description: "Group Storybook dependencies from apps/pie-storybook/package.json" + patterns: + - "@storybook/*" + - "storybook" + + - package-ecosystem: "github-actions" + directory: ".github/workflows" + schedule: + interval: "weekly" + ignore: + - dependency-type: "major" + open-pull-requests-limit: 3 + commit-message: + prefix: "DSW-000 update" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b36aefe4b..5049e6d0ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,10 +54,21 @@ env: jobs: dependency-changeset: - if: github.actor == 'renovate-bot' || github.actor == 'renovate[bot]' - uses: the-guild-org/shared-config/.github/workflows/changesets-dependencies.yaml@main - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.ref }} + - name: Add Changeset to PR + uses: StafflinePeoplePlus/dependabot-changesets@4844c33bad364143ee39ef4150c60409f306ed21 # v0.1.5 + with: + owner: ${{ github.repository_owner }} + repo: ${{ github.repository }} + pr-number: ${{ github.event.pull_request.number }} + token: ${{ secrets.CHANGESETS_TOKEN }} check-change-type: name: Get change type diff --git a/.github/workflows/dangerjs-checks.yml b/.github/workflows/dangerjs-checks.yml index 09b386d9f8..69f370803f 100644 --- a/.github/workflows/dangerjs-checks.yml +++ b/.github/workflows/dangerjs-checks.yml @@ -8,7 +8,7 @@ jobs: danger-checks: permissions: contents: read - if: ${{ github.event.pull_request.draft == false && github.actor != 'renovate-bot' && github.actor != 'renovate[bot]' }} + if: ${{ github.event.pull_request.draft == false && github.actor != 'dependabot[bot]' }} runs-on: ubuntu-latest steps: # Checkout the Repo diff --git a/README.md b/README.md index 609cf20255..007fa8e1aa 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,6 @@ Apache 2.0. license - - Renovate status - Libraries.io dependency status for GitHub repo GitHub Repo stars GitHub watchers diff --git a/dangerfile.js b/dangerfile.js index 925272bf76..394f0cff24 100644 --- a/dangerfile.js +++ b/dangerfile.js @@ -3,7 +3,6 @@ import { danger, fail } from 'danger'; const { pr } = danger.github; const validChangesetCategories = ['Added', 'Changed', 'Removed', 'Fixed']; -const isRenovatePR = pr.user.login === 'renovate[bot]'; const isDependabotPR = pr.user.login === 'dependabot[bot]'; // Check for correct Changeset formatting @@ -17,7 +16,7 @@ danger.git.created_files.filter((filepath) => filepath.includes('.changeset/') & const changesetCategories = diffString.match(changesetCategoryRegex); const numberOfCategories = changesetCategories ? changesetCategories.length : 0; - if (isRenovatePR) { + if (isDependabotPR) { // Check if at least one of the valid changeset categories is present if (numberOfCategories === 0) { fail(`:memo: Your changeset doesn't include a category. Please add one of: \`${validChangesetCategories.join(', ')}\`. Filepath: \`${filepath}`); @@ -39,6 +38,6 @@ danger.git.created_files.filter((filepath) => filepath.includes('.changeset/') & }); // Check for empty PR Description checkboxes - but not for automated version PRs -if (pr.body.includes('- [ ]') && !isDependabotPR && !isRenovatePR) { +if (pr.body.includes('- [ ]') && !isDependabotPR) { fail('You currently have an unchecked checklist item in your PR description.\n\nPlease confirm this check has been carried out – if it\'s not relevant to your PR, delete this line from the PR checklist.'); } From 3ce248c5e23a7612d23b1eba4efd4fb67021a43c Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Tue, 19 Nov 2024 11:33:41 +0000 Subject: [PATCH 2/3] update dependabot commit prefix --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 45c5aca2d0..bf26bfb441 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,7 @@ updates: - dependency-type: "major" open-pull-requests-limit: 3 commit-message: - prefix: "DSW-000 update" + prefix: "deps(npm): DSW-000 update" groups: babel: description: "Group Babel devDependencies from package.json within pie-monorepo" @@ -51,4 +51,4 @@ updates: - dependency-type: "major" open-pull-requests-limit: 3 commit-message: - prefix: "DSW-000 update" \ No newline at end of file + prefix: "deps(github-actions): DSW-000 update" \ No newline at end of file From b7d2944c8c5646e03c4cc4ef3e550ead14efc613 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Tue, 19 Nov 2024 12:16:07 +0000 Subject: [PATCH 3/3] delete renovate --- renovate.json | 213 -------------------------------------------------- 1 file changed, 213 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 30297f6995..0000000000 --- a/renovate.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "extends": [ - "schedule:daily", - ":rebaseStalePrs", - ":disableMajorUpdates", - ":dependencyDashboard" - ], - "prConcurrentLimit": 3, - "commitMessageAction": "DSW-000 update", - "major": false, - "packageRules": [ - { - "commitMessagePrefix": "chore(pie-monorepo)", - "description": "Group babel devDependencies from package.json within pie-monorepo", - "matchFiles": ["./package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["^@babel/*", "babel-*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "Babel", - "groupSlug": "root-babel-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-monorepo)", - "description": "Group JET devDependencies / dependencies from package.json within pie-monorepo", - "matchFiles": ["./package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchPackagePatterns": ["@justeat/*", "@justeattakeaway/*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "justeattakeaway", - "groupSlug": "root-just-eat-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-monorepo)", - "description": "Group playwright / other testing related devDependencies from package.json within pie-monorepo", - "matchFiles": ["./package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["@axe-core/playwright", "@percy/*", "@playwright/*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "percy", - "groupSlug": "root-percy-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-monorepo)", - "description": "Group Vitest devDependencies from package.json within pie-monorepo", - "matchFiles": ["./package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["viest-*", "@vitest"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "vitest", - "groupSlug": "root-vitest-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-monorepo)", - "description": "Group postcss devDependencies from package.json within pie-monorepo", - "matchFiles": ["./package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["postcss*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "postcss", - "groupSlug": "root-postcss-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-monorepo)", - "description": "Group stylelint devDependencies from package.json within pie-docs", - "matchFiles": ["./package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["stylelint*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "stylelint", - "groupSlug": "root-stylelint-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-docs)", - "description": "Group eleventy devDependencies from package.json within pie-docs", - "matchFiles": ["apps/pie-docs/package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["@11ty/*", "eleventy-*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "11ty", - "groupSlug": "pie-docs-11ty-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-docs)", - "description": "Group devdependencies / dependencies from package.json within pie-docs", - "matchFiles": ["apps/pie-docs/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchPackagePatterns": ["markdown-*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "markdown", - "groupSlug": "pie-docs-markdown-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-storybook)", - "description": "Group storybook devDependencies / dependencies from package.json within pie-storybook", - "matchFiles": ["apps/pie-storybook/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchPackagePatterns": ["@storybook/*", "storybook"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "storybook", - "groupSlug": "pie-storybook-storybook-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(pie-storybook)", - "description": "Group react devDependencies from package.json within pie-storybook", - "matchFiles": ["apps/pie-storybook/package.json"], - "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["react*"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "react", - "groupSlug": "pie-storybook-react-devDeps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-angular12)", - "description": "Group dependencies from package.json within wc-angular12", - "matchFiles": ["apps/examples/wc-angular12/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-angular12", - "groupSlug": "wc-angular12-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-next10)", - "description": "Group dependencies from package.json within wc-next10", - "matchFiles": ["apps/examples/wc-next10/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-next10", - "groupSlug": "wc-next10-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-next13)", - "description": "Group dependencies from package.json within wc-next13", - "matchFiles": ["apps/examples/wc-next13/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-next13", - "groupSlug": "wc-next13-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-nuxt2)", - "description": "Group dependencies from package.json within wc-nuxt2", - "matchFiles": ["apps/examples/wc-nuxt2/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-nuxt2", - "groupSlug": "wc-nuxt2-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-nuxt3)", - "description": "Group dependencies from package.json within wc-nuxt3", - "matchFiles": ["apps/examples/wc-nuxt3/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-nuxt3", - "groupSlug": "wc-nuxt3-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-react17)", - "description": "Group dependencies from package.json within wc-react17", - "matchFiles": ["apps/examples/wc-react17/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-react17", - "groupSlug": "wc-react17-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-react18)", - "description": "Group dependencies from package.json within wc-react18", - "matchFiles": ["apps/examples/wc-react18/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-react18", - "groupSlug": "wc-react18-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-vanilla)", - "description": "Group dependencies from package.json within wc-vanilla", - "matchFiles": ["apps/examples/wc-vanilla/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-vanilla", - "groupSlug": "wc-vanilla-deps", - "enabled": true - }, - { - "commitMessagePrefix": "chore(wc-vue3)", - "description": "Group dependencies from package.json within wc-vue3", - "matchFiles": ["apps/examples/wc-vue3/package.json"], - "matchDepTypes": ["devDependencies", "dependencies"], - "matchUpdateTypes": ["minor", "patch"], - "groupName": "wc-vue3", - "groupSlug": "wc-vue3-deps", - "enabled": true - } - ] -} \ No newline at end of file