From 9573e976d22b22c8054009cf80a77bab8668a804 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 05:30:32 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump husky from 8.0.3 to 9.0.11 Bumps [husky](https://github.com/typicode/husky) from 8.0.3 to 9.0.11. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v8.0.3...v9.0.11) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index e532890..f0f5124 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "eslint-config-prettier": "^8.7.0", "eslint-plugin-storybook": "^0.6.11", "happy-dom": "^12.10.3", - "husky": "^8.0.3", + "husky": "^9.0.11", "jest": "^29.5.0", "msw": "^0.49.2", "npm-run-all": "^4.1.5", @@ -23653,15 +23653,15 @@ } }, "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.0.11", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", + "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", "dev": true, "bin": { - "husky": "lib/bin.js" + "husky": "bin.mjs" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" @@ -53924,9 +53924,9 @@ "dev": true }, "husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.0.11", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", + "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", "dev": true }, "iconv-lite": { diff --git a/package.json b/package.json index 09974ec..cdad221 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "eslint-config-prettier": "^8.7.0", "eslint-plugin-storybook": "^0.6.11", "happy-dom": "^12.10.3", - "husky": "^8.0.3", + "husky": "^9.0.11", "jest": "^29.5.0", "msw": "^0.49.2", "npm-run-all": "^4.1.5", From 07bbb7751912af0d4becfa602a7941f3d204987a Mon Sep 17 00:00:00 2001 From: Andrea Mazzucchelli <60042277+andrmaz@users.noreply.github.com> Date: Mon, 26 Feb 2024 22:59:20 +0100 Subject: [PATCH 2/3] ci(workflow): update dependabot auto merge --- .github/workflows/dependabot-auto-merge.yml | 22 +++++---------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 493ae50..5fd0979 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,27 +1,15 @@ name: Dependabot Auto Merge on: - pull_request_target: + pull_request: jobs: - worker: + auto-merge: runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' steps: - - name: automerge - uses: actions/github-script@v7 + - uses: actions/checkout@v2 + - uses: ahmadnassri/action-dependabot-auto-merge@v2 with: - script: | - github.rest.pulls.createReview({ - owner: context.payload.repository.owner.login, - repo: context.payload.repository.name, - pull_number: context.payload.pull_request.number, - event: 'APPROVE' - }) - github.rest.pulls.merge({ - owner: context.payload.repository.owner.login, - repo: context.payload.repository.name, - pull_number: context.payload.pull_request.number - }) + target: minor github-token: ${{ secrets.GITHUB_TOKEN }} From c1595d93b952e69f4696d89c7a846190aca35054 Mon Sep 17 00:00:00 2001 From: Andrea Mazzucchelli <60042277+andrmaz@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:00:00 +0100 Subject: [PATCH 3/3] Revert "ci(workflow): update dependabot auto merge" --- .github/workflows/dependabot-auto-merge.yml | 22 ++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 5fd0979..493ae50 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,15 +1,27 @@ name: Dependabot Auto Merge on: - pull_request: + pull_request_target: jobs: - auto-merge: + worker: runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' steps: - - uses: actions/checkout@v2 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 + - name: automerge + uses: actions/github-script@v7 with: - target: minor + script: | + github.rest.pulls.createReview({ + owner: context.payload.repository.owner.login, + repo: context.payload.repository.name, + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }) + github.rest.pulls.merge({ + owner: context.payload.repository.owner.login, + repo: context.payload.repository.name, + pull_number: context.payload.pull_request.number + }) github-token: ${{ secrets.GITHUB_TOKEN }}