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 ISSUE_TEMPLATE #3243

Merged
merged 1 commit into from
Oct 21, 2023
Merged

fix ISSUE_TEMPLATE #3243

merged 1 commit into from
Oct 21, 2023

Conversation

khassel
Copy link
Collaborator

@khassel khassel commented Oct 20, 2023

fix for #3167

@codecov-commenter
Copy link

Codecov Report

Merging #3243 (b40bd32) into master (343e7de) will increase coverage by 0.08%.
The diff coverage is n/a.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@            Coverage Diff             @@
##           master    #3243      +/-   ##
==========================================
+ Coverage   25.19%   25.28%   +0.08%     
==========================================
  Files          54       54              
  Lines       11933    11933              
==========================================
+ Hits         3007     3017      +10     
+ Misses       8926     8916      -10     

see 2 files with indirect coverage changes

@khassel
Copy link
Collaborator Author

khassel commented Oct 20, 2023

strange these 2 old tests which are required to get the merge button visible ...

any ideas?

could try to push this commit directly on master

@rejas
Copy link
Collaborator

rejas commented Oct 20, 2023

strange these 2 old tests which are required to get the merge button visible ...

very strange, especially that 14.x one...

any ideas?

could try to push this commit directly on master

I would be okay with that, if github / git allows it :-)

@rejas
Copy link
Collaborator

rejas commented Oct 20, 2023

oh wait, wouldnt then the update notification be triggered for all users?

@khassel
Copy link
Collaborator Author

khassel commented Oct 20, 2023

oh wait, wouldnt then the update notification be triggered for all users?

no, I wrote this already in the issue.

as expected:

remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: 2 of 2 required status checks are expected.
To github.com:MichMich/MagicMirror.git
 ! [remote rejected]   master -> master (protected branch hook declined)
error: failed to push some refs to 'github.com:MichMich/MagicMirror.git'

So I think this can only be merged by @MichMich . If the "Squash and merge" button is disabled for him too he can disabled the check rule, do the merge and then enable this again.

@rejas
Copy link
Collaborator

rejas commented Oct 21, 2023

After a good nights sleep I'd be fine with merging it to develop. We can live another two month with this issue after having it for so long :-)

@khassel khassel changed the base branch from master to develop October 21, 2023 18:55
@khassel
Copy link
Collaborator Author

khassel commented Oct 21, 2023

@rejas moved to develop and now ready to merge

I will play with a master merge later to may find the cause of the node v14/v16 tests, couldn't reproduce this on my fork ...

@rejas rejas merged commit 6815dfa into MagicMirrorOrg:develop Oct 21, 2023
5 checks passed
@khassel khassel deleted the fix-issue-templ branch November 1, 2023 18:52
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.

3 participants