kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-05 23:27:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix check for mastermerge label (#3415)

Browse Source 
Mastermerge label wasnt checked correctly, this PR should hopefully
fixes it for good

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Veeck 2024-04-01 18:16:20 +02:00 committed by GitHub
parent b262bf6144
commit 53420f5be9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/enforce-pullrequest-rules.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
changeLogPath: "CHANGELOG.md" changeLogPath: "CHANGELOG.md"
skipLabels: "Skip Changelog" skipLabels: "Skip Changelog"
- name: "Enforce develop branch" - 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: | run: |
echo "This PR is based against the master branch and not a release or hotfix." 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'." echo "Please don't do this. Switch the branch to 'develop'."

1
CHANGELOG.md
View File

@ -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) - Don't display any `npm WARN <....>` on install (#3399)
- Fixed move suncalc dependency to production from dev, as it is used by clock module - 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) - [compliments] Fix mirror not responding anymore when no compliments are to be shown (#3385)
- [chore] Fixed mastermerge workflow (#3415)
### Deleted ### Deleted

16
package-lock.json generated
View File

@ -32,8 +32,8 @@
"@stylistic/eslint-plugin": "^1.7.0", "@stylistic/eslint-plugin": "^1.7.0",
"eslint-plugin-import": "^2.29.1", "eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.9.0", "eslint-plugin-jest": "^27.9.0",
"eslint-plugin-jsdoc": "^48.2.1", "eslint-plugin-jsdoc": "^48.2.2",
"eslint-plugin-package-json": "^0.12.0", "eslint-plugin-package-json": "^0.12.1",
"eslint-plugin-unicorn": "^51.0.1", "eslint-plugin-unicorn": "^51.0.1",
"express-basic-auth": "^1.2.1", "express-basic-auth": "^1.2.1",
"husky": "^9.0.11", "husky": "^9.0.11",
@ -4633,9 +4633,9 @@
} }
}, },
"node_modules/eslint-plugin-jsdoc": { "node_modules/eslint-plugin-jsdoc": {
"version": "48.2.1", "version": "48.2.2",
"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.2.tgz",
"integrity": "sha512-iUvbcyDZSO/9xSuRv2HQBw++8VkV/pt3UWtX9cpPH0l7GKPq78QC/6+PmyQHHvNZaTjAce6QVciEbnc6J/zH5g==", "integrity": "sha512-S0Gk+rpT5w/ephKCncUY7kUsix9uE4B9XI8D/fS1/26d8okE+vZsuG1IvIt4B6sJUdQqsnzi+YXfmh+HJG11CA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@es-joy/jsdoccomment": "~0.42.0", "@es-joy/jsdoccomment": "~0.42.0",
@ -4656,9 +4656,9 @@
} }
}, },
"node_modules/eslint-plugin-package-json": { "node_modules/eslint-plugin-package-json": {
"version": "0.12.0", "version": "0.12.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-package-json/-/eslint-plugin-package-json-0.12.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-package-json/-/eslint-plugin-package-json-0.12.1.tgz",
"integrity": "sha512-BtzhiA/7x7hqY+0fLXcgiN8wXGFyABJS93q/gns6MsAAPrbGFH3N7MYuCrNUEP60NPHQ4kAW04sPQarQBvJqHg==", "integrity": "sha512-Z70ddt7tvZrdLZv4V1OkoDqGnnFakVRmAAeP+y/18ZvpgoPJXkqa+JRJNh+tWQ2PMZU4CqleZ6tZOEoq47AY2g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"package-json-validator": "^0.6.3", "package-json-validator": "^0.6.3",

4
package.json
View File

@ -52,8 +52,8 @@
"@stylistic/eslint-plugin": "^1.7.0", "@stylistic/eslint-plugin": "^1.7.0",
"eslint-plugin-import": "^2.29.1", "eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.9.0", "eslint-plugin-jest": "^27.9.0",
"eslint-plugin-jsdoc": "^48.2.1", "eslint-plugin-jsdoc": "^48.2.2",
"eslint-plugin-package-json": "^0.12.0", "eslint-plugin-package-json": "^0.12.1",
"eslint-plugin-unicorn": "^51.0.1", "eslint-plugin-unicorn": "^51.0.1",
"express-basic-auth": "^1.2.1", "express-basic-auth": "^1.2.1",
"husky": "^9.0.11", "husky": "^9.0.11",