Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix check for mastermerge label #3415

Merged
merged 4 commits into from
Apr 1, 2024
Merged

Conversation

rejas
Copy link
Collaborator

@rejas rejas commented Apr 1, 2024

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

@rejas rejas changed the base branch from master to develop April 1, 2024 13:04
@rejas rejas changed the title Fixmastermerge Fix check for mastermerge label Apr 1, 2024
@rejas rejas removed the mastermerge label Apr 1, 2024
@khassel
Copy link
Collaborator

khassel commented Apr 1, 2024

@rejas ready to merge?

@rejas
Copy link
Collaborator Author

rejas commented Apr 1, 2024

Would like to wait until release is done

@rejas
Copy link
Collaborator Author

rejas commented Apr 1, 2024

or we merge this and re-build the release?

dependabot bot and others added 3 commits April 1, 2024 17:46
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](JoshuaKGoldberg/eslint-plugin-package-json@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] <support@github.com>
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](gajus/eslint-plugin-jsdoc@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] <support@github.com>
@rejas
Copy link
Collaborator Author

rejas commented Apr 1, 2024

@khassel updated it with some dep updates so I think we can merge it before we do the real 2.27.0 release

@khassel khassel merged commit 53420f5 into MagicMirrorOrg:develop Apr 1, 2024
6 checks passed
@rejas rejas deleted the fixmastermerge branch April 1, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants