Dev 1.3.5 as Next Stable Release #358

ExtremeFiretop · 2024-11-18T07:53:29Z

1. Forms post update = Done
2. Readme update = Done
3. Version.txt update = Done

Dev 1.3.5 as Next Stable Release

What's Changed/Fixed?:

PR: [ #353 ]
Code Improvements for Post-Reboot Script Calls.

Increased wait timers in the post-update reboot
Little fixes around the settings file using dos2unix and chmod 0664
(Thanks @Martinski4GitHub @Martinski)

PR: [ #354 ]
Trace log for update email notifications.

Added code to add some trace log for the post-reboot update email notifications (for debugging purposes).
(Thanks @Martinski4GitHub @Martinski)

BUG FIX: PR: [ #355 ]
Various Small Fixes.

More Regex fixes around versioning.
Fixed an issue around emails misidentifying as failed when it was really a success.

BUG FIX: PR: [ #356 ]
Improvements to Acquiring Lock File.

Fixes an issue where during the post-update reboot, 2 instances of MerlinAU would be called and the 2nd one encountered the lock file, causing the post-update email notification to not get sent.
Code improvements when the script is trying to obtain a lock file by allowing a 2nd instance to wait for the 1st instance to perform its job and exit. This now means that 2 or more instances could execute in a staggered pattern and not terminate immediately when a lock file is found.
(Thanks @Martinski4GitHub @Martinski)

As always, we highly recommend you update ASAP as this includes functional improvements and little bug fixes.
Tested against the latest 3004.388.8_4 and 3006.102.2_2

Significant Screenshots:

Reverse Sync Into Dev

Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] <support@github.com>

…/dev/all-actions-5f967e2fbc Bump actions/checkout from 4.2.1 to 4.2.2 in the all-actions group

Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.0.8 to 2.0.9 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v2.0.8...v2.0.9) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] <support@github.com>

…/dev/all-actions-35641a6c8a Bump softprops/action-gh-release from 2.0.8 to 2.0.9 in the all-actions group

Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.0.9 to 2.1.0 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v2.0.9...v2.1.0) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-actions ... Signed-off-by: dependabot[bot] <support@github.com>

…/dev/all-actions-a814e2c8f8 Bump softprops/action-gh-release from 2.0.9 to 2.1.0 in the all-actions group

Code changes to improve the chances for the post-reboot wait timeouts to succeed and also leave a log message for success or failure.

The final sleep delay before proceeding was increased to 60 seconds.

Code Improvements for Post-Reboot Script Calls

Added code to have some trace log for the post-reboot update email notifications (debugging purposes).

Trace log for update email notifications

…EmailFix Various Small Fixes

Code improvements, fine-tuning and a fix.

Code Improvements

ExtremeFiretop · 2024-11-18T08:13:46Z

@Martinski4GitHub

All good to go here :)

Martinski4GitHub · 2024-11-18T08:25:47Z

Just to be crystal clear. Are you "passing me the baton" now so I can merge?
Just want to avoid stepping on your toes while you're doing your thing... Better safe than sorry.

ExtremeFiretop · 2024-11-18T08:26:35Z

As long as your around I want your final approval the code and notes look good! Always!

Martinski4GitHub · 2024-11-18T08:27:29Z

Got you!! I'm on it...

Martinski4GitHub

Approved. Ready to ship!!

Martinski4GitHub · 2024-11-18T08:38:46Z

FYI, made a few wording changes in the release notes.

ExtremeFiretop · 2024-11-18T08:39:52Z

I'm adjusting the forum post now to reflect! :) Thank you buddy! Always a pleasure working with a Genius like yourself ;)

Martinski4GitHub · 2024-11-18T08:47:26Z

Back at you, buddy. Thanks for keeping me on my toes as well and for the 2nd pair of eyes in troubleshooting and eventually finding a solid solution.

We have a good dynamic going on!! After a year of collaboration, let's hope for another good year.

ExtremeFiretop · 2024-11-18T08:54:35Z

I have said it before and I'll say it again, we are a great duo, and even Tom mentioned it to me via email.

No single person can ever be expected to catch it all. I may not have the in depth knowledge you have, but I like to think I still throw you a curve ball once in a while 😉

Hahaha! Another year cheers to that!
Goodnight buddy I'm off to count some sheep 🐏

Martinski4GitHub · 2024-11-18T09:07:31Z

Indeed, no single person can do it all, or do it well all the time. It's the product of a team effort.
I hope to hit all your curve balls... :>) LOL

Off to Dreamland for me as well. Have a good night, bud.

ExtremeFiretop · 2024-11-18T15:01:24Z

You always hit them out of the park ;P Home runs everytime!

ExtremeFiretop and others added 30 commits October 26, 2024 11:04

Merge pull request #348 from ExtremeFiretop/main

330fd1a

Reverse Sync Into Dev

Update MerlinAU.sh

477f27f

Merge pull request #349 from ExtremeFiretop/dependabot/github_actions…

c73e7c6

…/dev/all-actions-5f967e2fbc Bump actions/checkout from 4.2.1 to 4.2.2 in the all-actions group

Merge pull request #350 from ExtremeFiretop/dependabot/github_actions…

e98b5bd

…/dev/all-actions-35641a6c8a Bump softprops/action-gh-release from 2.0.8 to 2.0.9 in the all-actions group

Merge pull request #351 from ExtremeFiretop/dependabot/github_actions…

53e2cec

…/dev/all-actions-a814e2c8f8 Bump softprops/action-gh-release from 2.0.9 to 2.1.0 in the all-actions group

Code Improvements for Post-Reboot Script Calls

5e88d2e

Code changes to improve the chances for the post-reboot wait timeouts to succeed and also leave a log message for success or failure.

Merge branch 'ExtremeFiretop:dev' into dev

a0558d1

Increased sleep to 60 sec.

868c642

The final sleep delay before proceeding was increased to 60 seconds.

Merge pull request #353 from Martinski4GitHub/dev

6ca62be

Code Improvements for Post-Reboot Script Calls

Trace log for update email notifications

76df768

Added code to have some trace log for the post-reboot update email notifications (debugging purposes).

Merge pull request #354 from Martinski4GitHub/dev

b3c86f3

Trace log for update email notifications

Update MerlinAU.sh

123831f

Update MerlinAU.sh

2f802be

Update MerlinAU.sh

f5049c6

Update MerlinAU.sh

f9b5cf6

Update MerlinAU.sh

37ef83a

Update MerlinAU.sh

f055bd9

Update MerlinAU.sh

92c35ee

Update MerlinAU.sh

eb83d07

Update MerlinAU.sh

9a67caf

Update MerlinAU.sh

cf6d0dc

Update MerlinAU.sh

c3175e7

Update MerlinAU.sh

e0066a9

Update MerlinAU.sh

2a43597

Update MerlinAU.sh

6c11b40

Update MerlinAU.sh

7cc01f5

Update MerlinAU.sh

def0867

ExtremeFiretop and others added 11 commits November 16, 2024 10:58

Update MerlinAU.sh

f8f0cd9

Update MerlinAU.sh

b58d525

Update MerlinAU.sh

23fe688

Update MerlinAU.sh

42fdc44

Update MerlinAU.sh

0914b1b

Update MerlinAU.sh

e0a72f0

Update MerlinAU.sh

5b3da64

Update MerlinAU.sh

684665e

Merge pull request #355 from ExtremeFiretop/ExtremeFiretop-PostUpdate…

c1fd054

…EmailFix Various Small Fixes

Code Improvements

c812bb8

Code improvements, fine-tuning and a fix.

Merge pull request #357 from Martinski4GitHub/dev

54a029f

Code Improvements

ExtremeFiretop requested a review from Martinski4GitHub as a code owner November 18, 2024 07:53

Update README.md

a721de2

ExtremeFiretop enabled auto-merge November 18, 2024 08:15

ExtremeFiretop assigned ExtremeFiretop and Martinski4GitHub Nov 18, 2024

ExtremeFiretop added bug Something isn't working enhancement New feature or request labels Nov 18, 2024

Martinski4GitHub approved these changes Nov 18, 2024

View reviewed changes

ExtremeFiretop merged commit fba9af6 into main Nov 18, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev 1.3.5 as Next Stable Release #358

Dev 1.3.5 as Next Stable Release #358

ExtremeFiretop commented Nov 18, 2024 •

edited by Martinski4GitHub

Loading

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

Martinski4GitHub left a comment

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Dev 1.3.5 as Next Stable Release #358

Dev 1.3.5 as Next Stable Release #358

Conversation

ExtremeFiretop commented Nov 18, 2024 • edited by Martinski4GitHub Loading

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

Martinski4GitHub left a comment

Choose a reason for hiding this comment

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

Martinski4GitHub commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024

ExtremeFiretop commented Nov 18, 2024 •

edited by Martinski4GitHub

Loading