From 14cd6e5e7485010135efb3b47f6888b05e5ef305 Mon Sep 17 00:00:00 2001 From: veeck Date: Mon, 1 Apr 2024 15:01:46 +0200 Subject: [PATCH 1/4] try to fix mastermerge --- .github/workflows/enforce-pullrequest-rules.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/enforce-pullrequest-rules.yaml b/.github/workflows/enforce-pullrequest-rules.yaml index 22d9c212ea..30c0d0ca08 100644 --- a/.github/workflows/enforce-pullrequest-rules.yaml +++ b/.github/workflows/enforce-pullrequest-rules.yaml @@ -19,7 +19,7 @@ jobs: changeLogPath: "CHANGELOG.md" skipLabels: "Skip Changelog" - name: "Enforce develop branch" - if: ${{ github.base_ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'mastermerge') }} + if: ${{ github.event.pull_request.base.ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'mastermerge') }} run: | echo "This PR is based against the master branch and not a release or hotfix." echo "Please don't do this. Switch the branch to 'develop'." From 0abddf3d074548d94fcd93361a15b5dc5bb787f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 10:18:05 +0000 Subject: [PATCH 2/4] Bump eslint-plugin-package-json from 0.12.0 to 0.12.1 Bumps [eslint-plugin-package-json](https://github.com/JoshuaKGoldberg/eslint-plugin-package-json) from 0.12.0 to 0.12.1. - [Release notes](https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/releases) - [Changelog](https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/blob/main/CHANGELOG.md) - [Commits](https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/compare/v0.12.0...v0.12.1) --- updated-dependencies: - dependency-name: eslint-plugin-package-json dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 713e594e5c..70c5bbcb54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^27.9.0", "eslint-plugin-jsdoc": "^48.2.1", - "eslint-plugin-package-json": "^0.12.0", + "eslint-plugin-package-json": "^0.12.1", "eslint-plugin-unicorn": "^51.0.1", "express-basic-auth": "^1.2.1", "husky": "^9.0.11", @@ -4656,9 +4656,9 @@ } }, "node_modules/eslint-plugin-package-json": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-package-json/-/eslint-plugin-package-json-0.12.0.tgz", - "integrity": "sha512-BtzhiA/7x7hqY+0fLXcgiN8wXGFyABJS93q/gns6MsAAPrbGFH3N7MYuCrNUEP60NPHQ4kAW04sPQarQBvJqHg==", + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-package-json/-/eslint-plugin-package-json-0.12.1.tgz", + "integrity": "sha512-Z70ddt7tvZrdLZv4V1OkoDqGnnFakVRmAAeP+y/18ZvpgoPJXkqa+JRJNh+tWQ2PMZU4CqleZ6tZOEoq47AY2g==", "dev": true, "dependencies": { "package-json-validator": "^0.6.3", diff --git a/package.json b/package.json index 85d547c20d..fcd24d27ac 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^27.9.0", "eslint-plugin-jsdoc": "^48.2.1", - "eslint-plugin-package-json": "^0.12.0", + "eslint-plugin-package-json": "^0.12.1", "eslint-plugin-unicorn": "^51.0.1", "express-basic-auth": "^1.2.1", "husky": "^9.0.11", From 11cbb1df0778c0a20d6c3c753ed798027d93ac78 Mon Sep 17 00:00:00 2001 From: veeck Date: Mon, 1 Apr 2024 17:51:02 +0200 Subject: [PATCH 3/4] Bump eslint-plugin-jsdoc from 48.2.1 to 48.2.2 Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 48.2.1 to 48.2.2. - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc) - [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v48.2.1...v48.2.2) --- updated-dependencies: - dependency-name: eslint-plugin-jsdoc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70c5bbcb54..f116244dd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "@stylistic/eslint-plugin": "^1.7.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-jsdoc": "^48.2.1", + "eslint-plugin-jsdoc": "^48.2.2", "eslint-plugin-package-json": "^0.12.1", "eslint-plugin-unicorn": "^51.0.1", "express-basic-auth": "^1.2.1", @@ -4633,9 +4633,9 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "48.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.1.tgz", - "integrity": "sha512-iUvbcyDZSO/9xSuRv2HQBw++8VkV/pt3UWtX9cpPH0l7GKPq78QC/6+PmyQHHvNZaTjAce6QVciEbnc6J/zH5g==", + "version": "48.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.2.tgz", + "integrity": "sha512-S0Gk+rpT5w/ephKCncUY7kUsix9uE4B9XI8D/fS1/26d8okE+vZsuG1IvIt4B6sJUdQqsnzi+YXfmh+HJG11CA==", "dev": true, "dependencies": { "@es-joy/jsdoccomment": "~0.42.0", diff --git a/package.json b/package.json index fcd24d27ac..949306ca8e 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@stylistic/eslint-plugin": "^1.7.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-jsdoc": "^48.2.1", + "eslint-plugin-jsdoc": "^48.2.2", "eslint-plugin-package-json": "^0.12.1", "eslint-plugin-unicorn": "^51.0.1", "express-basic-auth": "^1.2.1", From ebe596fa3a2b43096cab644f82d1f0cbb561f77b Mon Sep 17 00:00:00 2001 From: veeck Date: Mon, 1 Apr 2024 17:54:18 +0200 Subject: [PATCH 4/4] update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 708b05ba3b..9669d7e6c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ For more info, please read the following post: [A New Chapter for MagicMirror: T - Don't display any `npm WARN <....>` on install (#3399) - Fixed move suncalc dependency to production from dev, as it is used by clock module - [compliments] Fix mirror not responding anymore when no compliments are to be shown (#3385) +- [chore] Fixed mastermerge workflow (#3415) ### Deleted