search

ExtremeFiretop / MerlinAutoUpdate-Router

Merlin(A)uto(U)pdate is a Merlin router script which allows you to remotely identify a stable firmware update for an ASUS Merlin router, and automatically download and update via an unattended method directly from the router.
https://www.snbforums.com/threads/merlinau-v1-2-7-the-ultimate-firmware-auto-updater-amtm-addon.91326/
GNU General Public License v3.0
21 stars 1 forks source link

Dev 1.3.1 as Next Stable Release #306

Closed ExtremeFiretop closed 1 month ago

ExtremeFiretop commented 1 month ago

Dev 1.3.1 as Next Stable Release

What's Changed/Fixed?:

PR: [ #301 ]

PR: [ #302 ]

PR: [ #305 ]

PR: [ #308 ]

As always, we highly recommend you update ASAP as this includes lots of functional improvements and little bug fixes.

ExtremeFiretop commented 1 month ago

@Martinski4GitHub

Updated the notes here and in the forums :) Auto-merge enabled on my side once you approve. Ignore the out of date warning, it's about the dev/master flag being changed manually after the last failed workflow to update it.

Speaking of which, lets make sure the workflow correctly updates the dev flag once this is merged in.

Martinski4GitHub commented 1 month ago

@Martinski4GitHub

Updated the notes here and in the forums :) Auto-merge enabled on my side once you approve. Ignore the out of date warning, it's about the dev/master flag being changed manually after the last failed workflow to update it.

Speaking of which, lets make sure the workflow correctly updates the dev flag once this is merged in.

Apologies for the delayed response. About 3 weeks ago, my wife's mother had a minor stroke (aka transient ischemic attack) so she's currently still recovering. Tonight during our dinner, my wife's father called and said that her mother was not feeling well, so we drove to their home to check and make sure there was not an emergency situation.

Anyway, I'll approve this now. Hopefully, everything will just work.

ExtremeFiretop commented 1 month ago

@Martinski4GitHub Updated the notes here and in the forums :) Auto-merge enabled on my side once you approve. Ignore the out of date warning, it's about the dev/master flag being changed manually after the last failed workflow to update it. Speaking of which, lets make sure the workflow correctly updates the dev flag once this is merged in.

Apologies for the delayed response. About 3 weeks ago, my wife's mother had a minor stroke (aka transient ischemic attack) so she's currently still recovering. Tonight during our dinner, my wife's father called and said that her mother was not feeling well, so we drove to their home to check and make sure there was not an emergency situation.

Anyway, I'll approve this now. Hopefully, everything will just work.

I'm sorry to hear that, I do hope the recovery goes well. I'm sure she appreciates the support!

ExtremeFiretop commented 1 month ago

@Martinski4GitHub

Well now I'm very confused.

It seems to have updated the branch, but failed the workflow?

Martinski4GitHub commented 1 month ago

@Martinski4GitHub Updated the notes here and in the forums :) Auto-merge enabled on my side once you approve. Ignore the out of date warning, it's about the dev/master flag being changed manually after the last failed workflow to update it. Speaking of which, lets make sure the workflow correctly updates the dev flag once this is merged in.

Apologies for the delayed response. About 3 weeks ago, my wife's mother had a minor stroke (aka transient ischemic attack) so she's currently still recovering. Tonight during our dinner, my wife's father called and said that her mother was not feeling well, so we drove to their home to check and make sure there was not an emergency situation.

Anyway, I'll approve this now. Hopefully, everything will just work.

I'm sorry to hear that, I do hope the recovery goes well. I'm sure she appreciates the support!

Thank you. We're all very hopeful that she'll have a full recovery because it was not a full stroke, and her cognitive and language skills were not affected; only some of her physical coordination was affected. The doctors are very optimistic as well and said that thankfully it was only a minor stroke and was treated on time.

Martinski4GitHub commented 1 month ago

@Martinski4GitHub

Well now I'm very confused.

It seems to have updated the branch, but failed the workflow?

I noticed it didn't merge automatically after the approval and thought it might have been due to the "out-of-date warning." 🤷

ExtremeFiretop commented 1 month ago

@Martinski4GitHub Well now I'm very confused. It seems to have updated the branch, but failed the workflow?

I noticed it didn't merge automatically after the approval and thought it might have been due to the "out-of-date warning." 🤷

I fixed it, the problem is the sed command didn't make any changes to the file, because the file already included "master" and "1.3.1" so it failed to commit any changes. And cancelled the workflow.

So I made that step optional, if there is changes, commit them, else skip that step. Now it worked. Next time we should try without updating the version early. As for the branch, I'm about to fix the out of sync warning now.

Martinski4GitHub commented 1 month ago

@Martinski4GitHub Well now I'm very confused. It seems to have updated the branch, but failed the workflow?

I noticed it didn't merge automatically after the approval and thought it might have been due to the "out-of-date warning." 🤷

I fixed it, the problem is the sed command didn't make any changes to the file, because the file already included "dev" and "1.3.1" so it failed to commit any changes. And cancelled the workflow.

So I made that step optional, if there is changes, commit them, else skip that step. Now it worked. Next time we should try without updating the version early. As for the branch, I'm about to fix the out of sync warning now.

I'm very used to updating the version string on my 'development' branch as soon as some code changes are made so that during testing & verification I know I'm working with & executing a new development version and not still the 'stable' version.

ExtremeFiretop commented 1 month ago

@Martinski4GitHub Well now I'm very confused. It seems to have updated the branch, but failed the workflow?

I noticed it didn't merge automatically after the approval and thought it might have been due to the "out-of-date warning." 🤷

I fixed it, the problem is the sed command didn't make any changes to the file, because the file already included "dev" and "1.3.1" so it failed to commit any changes. And cancelled the workflow. So I made that step optional, if there is changes, commit them, else skip that step. Now it worked. Next time we should try without updating the version early. As for the branch, I'm about to fix the out of sync warning now.

I'm very used to updating the version string on my 'development' branch as soon as some code changes are made so that during testing & verification I know I'm working with & executing a new development version and not still the 'stable' version.

Oh it's not just you, I also updated it early on my dev branch, if we do, and no changes are made to the file at least it will skip it now without failing.

I just wanted to see that step in action, but considering the out of sync warning is now fixed, it should run next time anyways to update the branch string from dev to master.