Skip to content

Backport 1.4.0 Fixes to 1.3.11#430

Merged
ExtremeFiretop merged 4 commits intomainfrom
main-patched
Mar 25, 2025
Merged

Backport 1.4.0 Fixes to 1.3.11#430
ExtremeFiretop merged 4 commits intomainfrom
main-patched

Conversation

@ExtremeFiretop
Copy link
Owner

@ExtremeFiretop ExtremeFiretop commented Mar 25, 2025

Forms post update = READY
Readme update = COMPLETED
Version.txt update = COMPLETED

Dev 1.3.11 as Next Stable Release

What's Changed/Fixed?:

Backport 1.4.0 Fixes to 1.3.11 Production
This includes changes from the following PRs:

https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/pull/415/files
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/pull/423/files
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/pull/424/files

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub

So this branch is currently our "dev" branch temporarily to work around the WebUI changes.
I've backported the changes I think are of value, let me know if you wanna change anything or submit anything before we merge.

As expected my workflow is mad we are doing this; but we are smart enough to know what we are doing. I will enable auto-merge on my side, which means you'll probably need to actually approve this PR and merge on your side when ready.

@ExtremeFiretop ExtremeFiretop added bug Something isn't working enhancement New feature or request labels Mar 25, 2025
@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub

This is it for me tonight; I'll probably be online for another hour but in bed or on the couch, otherwise even if i'm not; feel free to approve and merge whenever your ready.

@Martinski4GitHub
Copy link
Collaborator

@Martinski4GitHub

So this branch is currently our "dev" branch temporarily to work around the WebUI changes. I've backported the changes I think are of value, let me know if you wanna change anything or submit anything before we merge.

As expected my workflow is mad we are doing this; but we are smart enough to know what we are doing. I will enable auto-merge on my side, which means you'll probably need to actually approve this PR and merge on your side when ready.

Looking good. I have nothing else to add for this 1.3.11 release.

Copy link
Collaborator

@Martinski4GitHub Martinski4GitHub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved & good to go!!

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub

Question; do you get this option on your side? Or is that just a me thing?

image

@Martinski4GitHub
Copy link
Collaborator

@Martinski4GitHub

Question; do you get this option on your side? Or is that just a me thing?

image

I've looked around and l clicked on some options but no, I don't get that.
This is all I see:
GitHub_PR#430

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub
Question; do you get this option on your side? Or is that just a me thing?
image

I've looked around and l clicked on some options but no, I don't get that. This is all I see: GitHub_PR#430

This might be something only the actual branch owner can do, even though your identified as a code owner.
Learning new things everyday; although it's not often we need to bypass the rules I setup, so I'm not overly concerned.

I'll do the bypass :) Please stand by...

image

@ExtremeFiretop ExtremeFiretop disabled auto-merge March 25, 2025 06:24
@ExtremeFiretop ExtremeFiretop merged commit be415c4 into main Mar 25, 2025
1 check failed
@Martinski4GitHub
Copy link
Collaborator

@Martinski4GitHub
Question; do you get this option on your side? Or is that just a me thing?
image

I've looked around and l clicked on some options but no, I don't get that. This is all I see: GitHub_PR#430

This might be something only the actual branch owner can do, even though your identified as a code owner.

Looks like it is...

Learning new things everyday; although it's not often we need to bypass the rules I setup, so I'm not overly concerned.

I'll do the bypass :) Please stand by...

👍

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub

Done; just needed to manually do the release since we didn't trigger the workflow when I did the bypass.
Thanks again buddy!

@ExtremeFiretop ExtremeFiretop deleted the main-patched branch March 25, 2025 06:31
@Martinski4GitHub
Copy link
Collaborator

@Martinski4GitHub

Done; just needed to manually do the release since we didn't trigger the workflow when I did the bypass. Thanks again buddy!

Hold on just for a couple of minutes... just some cosmetic changes...

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub
Done; just needed to manually do the release since we didn't trigger the workflow when I did the bypass. Thanks again buddy!

Hold on just for a couple of minutes... just some cosmetic changes...

Did I pull the trigger on you too early?!?

@Martinski4GitHub
Copy link
Collaborator

Martinski4GitHub commented Mar 25, 2025

@Martinski4GitHub
Done; just needed to manually do the release since we didn't trigger the workflow when I did the bypass. Thanks again buddy!

Hold on just for a couple of minutes... just some cosmetic changes...

Did I pull the trigger on you too early?!?

Nope. Great timing. We're good to go. Let it rip, bud!!!!

@ExtremeFiretop
Copy link
Owner Author

@Martinski4GitHub
Done; just needed to manually do the release since we didn't trigger the workflow when I did the bypass. Thanks again buddy!

Hold on just for a couple of minutes... just some cosmetic changes...

Did I pull the trigger on you too early?!?

Nope. Great timing. We're good to go. Let it rip, bud!!!!

All good! It's merged in main, plus I republished the github release; like it was always planned ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants