From 8ecda7734373e929f020274e6894cf6b2f95a768 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:52:41 -0800 Subject: [PATCH 01/11] Improved Code to Unmount USB Drives - Improved/modified code that tries to unmount the USB-attached drives before flashing the F/W. If any USB drive is "busy" the code waits until it becomes idle, up to a maximum of 150 secs (2.5 minutes). --- MerlinAU.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++------- README.md | 4 ++-- version.txt | 2 +- 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 93ef4874..7708e579 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,13 +4,13 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Nov-05 +# Last Modified: 2025-Nov-09 ################################################################### set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.5.6 -readonly SCRIPT_VERSTAG="25110520" +readonly SCRIPT_VERSION=1.5.7 +readonly SCRIPT_VERSTAG="25110922" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -8772,8 +8772,52 @@ _RunOfflineUpdateNow_() fi } +##-------------------------------------## +## Added by Martinski W. [2025-Nov-09] ## +##-------------------------------------## +_Unmount_Eject_USB_Drives_() +{ + local eject_USB_OK=1 usbMountPoint="" + local curWaitDelaySecs=0 + local theWaitDelaySecs=5 + local maxWaitDelaySecs=150 # Enough time?? # + local logMsg="Unmount/Eject USB Drives" + + _MsgToSysLog_() { logger -st "${SCRIPT_NAME}_[$$]" -p 4 "$1" ; } + + _MsgToSysLog_ "START of ${logMsg}..." + + while [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ] + do + if /sbin/ejusb -1 0 -u 1 2>/dev/null + then + eject_USB_OK=0 ; break + fi + if ! usbMountPoint="$(_GetDefaultUSBMountPoint_)" + then + _MsgToSysLog_ "${logMsg}. No USB-attached drives were found." + eject_USB_OK=0 ; break + fi + if [ "$curWaitDelaySecs" -gt 0 ] && \ + [ "$((curWaitDelaySecs % 10))" -eq 0 ] + then _MsgToSysLog_ "$logMsg Wait Timeout [$curWaitDelaySecs secs]..." + fi + + sleep "$theWaitDelaySecs" + curWaitDelaySecs="$((curWaitDelaySecs + theWaitDelaySecs))" + done + + if [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ] + then _MsgToSysLog_ "$logMsg [$curWaitDelaySecs secs] succeeded." + else _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired." + fi + + _MsgToSysLog_ "END of ${logMsg}." + return "$eject_USB_OK" +} + ##----------------------------------------## -## Modified by Martinski W. [2025-Nov-05] ## +## Modified by Martinski W. [2025-Nov-09] ## ##----------------------------------------## _RunFirmwareUpdateNow_() { @@ -9339,7 +9383,13 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or # *WARNING*: NO MORE logging at this point & beyond # sync ; sleep 2 ; echo 3 > /proc/sys/vm/drop_caches ; sleep 3 - /sbin/ejusb -1 0 -u 1 2>/dev/null + + ##-------------------------------------## + ## Added by Martinski W. [2025-Nov-09] ## + ##-------------------------------------## + # Unmount the USB drives. If "busy" let's wait until "idle" state. # + #------------------------------------------------------------------# + _Unmount_Eject_USB_Drives_ #----------------------------------------------------------------------------------# # **IMPORTANT NOTE**: @@ -9450,7 +9500,7 @@ _PostUpdateEmailNotification_() then break ; fi if [ "$curWaitDelaySecs" -gt 0 ] && \ - [ "$((curWaitDelaySecs % 60))" -eq 0 ] + [ "$((curWaitDelaySecs % 30))" -eq 0 ] then Say "$logMsg [$curWaitDelaySecs secs.]..." ; fi sleep $theWaitDelaySecs @@ -9462,7 +9512,7 @@ _PostUpdateEmailNotification_() else Say "$logMsg [$maxWaitDelaySecs sec.] expired." fi - Say "END of $logMsg [$$curWaitDelaySecs sec.]" + Say "END of $logMsg [$curWaitDelaySecs sec.]" sleep 20 ## Let's wait a bit & proceed ## _SendEMailNotification_ POST_REBOOT_FW_UPDATE_STATUS } @@ -9494,7 +9544,7 @@ _PostRebootRunNow_() then break ; fi if [ "$curWaitDelaySecs" -gt 0 ] && \ - [ "$((curWaitDelaySecs % 60))" -eq 0 ] + [ "$((curWaitDelaySecs % 30))" -eq 0 ] then Say "$logMsg [$curWaitDelaySecs secs.]..." ; fi sleep $theWaitDelaySecs @@ -9506,7 +9556,7 @@ _PostRebootRunNow_() else Say "$logMsg [$maxWaitDelaySecs sec.] expired." fi - Say "END of $logMsg [$$curWaitDelaySecs sec.]" + Say "END of $logMsg [$curWaitDelaySecs sec.]" sleep 30 ## Let's wait a bit & proceed ## if _AcquireLock_ cliFileLock then diff --git a/README.md b/README.md index 5a1f879c..8887eb50 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.5.6 -## 2025-Nov-07 +## v1.5.7 +## 2025-Nov-09 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e) diff --git a/version.txt b/version.txt index eac1e0ad..f01291b8 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.6 +1.5.7 From 39a81d7301e367c8446625738b2ac96f484b71bf Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 9 Nov 2025 23:11:17 -0800 Subject: [PATCH 02/11] Code Improvement. Fine-tuning code. --- MerlinAU.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 7708e579..aba65b6d 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -8780,8 +8780,8 @@ _Unmount_Eject_USB_Drives_() local eject_USB_OK=1 usbMountPoint="" local curWaitDelaySecs=0 local theWaitDelaySecs=5 - local maxWaitDelaySecs=150 # Enough time?? # - local logMsg="Unmount/Eject USB Drives" + local maxWaitDelaySecs=180 # 3 mins enough time?? # + local logMsg="Unmount/Eject USB Drive" _MsgToSysLog_() { logger -st "${SCRIPT_NAME}_[$$]" -p 4 "$1" ; } @@ -8812,6 +8812,11 @@ _Unmount_Eject_USB_Drives_() else _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired." fi + if [ "$eject_USB_OK" -ne 0 ] + then + _MsgToSysLog_ "Unable to unmount USB drive. Device is likely busy." + fi + _MsgToSysLog_ "END of ${logMsg}." return "$eject_USB_OK" } From f0fcc2c906e2984cf0efdab193e9aeef718dfe82 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Mon, 10 Nov 2025 04:18:24 -0800 Subject: [PATCH 03/11] Improved Code to Unmount USB Drive Made improvements in function to unmount the USB drives before flashing F/W image. --- MerlinAU.sh | 65 +++++++++++++++++++++++++++++++++++++---------------- README.md | 2 +- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index bcbc297c..260b183a 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,16 +4,16 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Nov-09 +# Last Modified: 2025-Nov-10 ################################################################### set -u ## Set version for each Production Release ## readonly SCRIPT_VERSION=1.5.7 -readonly SCRIPT_VERSTAG="25110922" +readonly SCRIPT_VERSTAG="25111002" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="master" +SCRIPT_BRANCH="dev" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## @@ -8777,27 +8777,55 @@ _RunOfflineUpdateNow_() ##-------------------------------------## _Unmount_Eject_USB_Drives_() { - local eject_USB_OK=1 usbMountPoint="" - local curWaitDelaySecs=0 - local theWaitDelaySecs=5 - local maxWaitDelaySecs=180 # 3 mins enough time?? # + local maxWaitDelaySecs=240 #4 mins# + local theWaitDelaySecs=5 curWaitDelaySecs=0 + local ejectUSB_OK=false ejectUSB_PID="" usbMountPoint="" local logMsg="Unmount/Eject USB Drive" _MsgToSysLog_() { logger -st "${SCRIPT_NAME}_[$$]" -p 4 "$1" ; } _MsgToSysLog_ "START of ${logMsg}..." + /sbin/ejusb -1 0 -u 1 2>/dev/null & ejectUSB_PID=$! + while [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ] do - if /sbin/ejusb -1 0 -u 1 2>/dev/null + ## If unmount succeeded, then exit loop ## + if [ -n "$ejectUSB_PID" ] && \ + ! kill -EXIT "$ejectUSB_PID" 2>/dev/null && \ + ! usbMountPoint="$(_GetDefaultUSBMountPoint_)" then - eject_USB_OK=0 ; break + ejectUSB_OK=true ; break fi + + ## If USB drive is no longer mounted, exit loop ## if ! usbMountPoint="$(_GetDefaultUSBMountPoint_)" then - _MsgToSysLog_ "${logMsg}. No USB-attached drives were found." - eject_USB_OK=0 ; break + _MsgToSysLog_ "${logMsg}: No USB drives are mounted." + ejectUSB_OK=true ; break + fi + + ## If timeout was reached, check again and exit loop ## + if [ -n "$ejectUSB_PID" ] && \ + [ "$curWaitDelaySecs" -ge "$maxWaitDelaySecs" ] + then + if ! kill -EXIT "$ejectUSB_PID" 2>/dev/null && \ + ! usbMountPoint="$(_GetDefaultUSBMountPoint_)" + then + ejectUSB_OK=true ; break + fi + kill -KILL "$ejectUSB_PID" 2>/dev/null + wait $ejectUSB_PID ; break + fi + + ## If USB drive is still mounted, try again ## + if [ -n "$ejectUSB_PID" ] && \ + ! kill -EXIT "$ejectUSB_PID" 2>/dev/null && \ + usbMountPoint="$(_GetDefaultUSBMountPoint_)" + then + /sbin/ejusb -1 0 -u 1 2>/dev/null & ejectUSB_PID=$! fi + if [ "$curWaitDelaySecs" -gt 0 ] && \ [ "$((curWaitDelaySecs % 10))" -eq 0 ] then _MsgToSysLog_ "$logMsg Wait Timeout [$curWaitDelaySecs secs]..." @@ -8807,18 +8835,17 @@ _Unmount_Eject_USB_Drives_() curWaitDelaySecs="$((curWaitDelaySecs + theWaitDelaySecs))" done - if [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ] - then _MsgToSysLog_ "$logMsg [$curWaitDelaySecs secs] succeeded." - else _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired." - fi - - if [ "$eject_USB_OK" -ne 0 ] + if "$ejectUSB_OK" || \ + [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ] then + _MsgToSysLog_ "$logMsg succeeded [$curWaitDelaySecs secs]" + else + _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired." _MsgToSysLog_ "Unable to unmount USB drive. Device is likely busy." fi - _MsgToSysLog_ "END of ${logMsg}." - return "$eject_USB_OK" + + "$ejectUSB_OK" && return 0 || return 1 } ##----------------------------------------## diff --git a/README.md b/README.md index 8887eb50..96afc249 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater ## v1.5.7 -## 2025-Nov-09 +## 2025-Nov-10 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e) From 05aeaa4b61d2d514fd0fb5bc93b6823b35d6fd46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 23:11:14 +0000 Subject: [PATCH 04/11] Bump softprops/action-gh-release 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.4.1 to 2.4.2 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.4.1...v2.4.2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.4.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 0ce29af0..a21267d1 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -85,7 +85,7 @@ jobs: git push origin ${{ steps.nextver.outputs.tag }} - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.4.1 + uses: softprops/action-gh-release@v2.4.2 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} From 76a1152e18ede93102cf66a16dd0ff22d94fffdc Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Mon, 10 Nov 2025 20:52:41 -0800 Subject: [PATCH 05/11] Email Notification when USB Drive Unmount Fails Added an email notification when unmounting the USB-attached drive fails after trying for 4 minutes. --- MerlinAU.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 260b183a..7e5edf67 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -10,7 +10,7 @@ set -u ## Set version for each Production Release ## readonly SCRIPT_VERSION=1.5.7 -readonly SCRIPT_VERSTAG="25111002" +readonly SCRIPT_VERSTAG="25111020" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -3000,9 +3000,9 @@ _GetLatestFWUpdateVersionFromRouter_() echo "$newVersionStr" ; return "$retCode" } -##------------------------------------------## -## Modified by ExtremeFiretop [2025-Jun-17] ## -##------------------------------------------## +##----------------------------------------## +## Modified by Martinski W. [2025-Nov-10] ## +##----------------------------------------## _CreateEMailContent_() { if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi @@ -3080,6 +3080,13 @@ _CreateEMailContent_() printf "\nThe F/W version that is currently installed:\n${fwInstalledVersion}\n" } > "$tempEMailBodyMsg" ;; + FAILED_USB_DRIVE_UNMOUNT) + emailBodyTitle="USB Drive Unmount Failed" + { + echo "Unable to unmount the USB-attached drive before the F/W Update flash was started on the ${MODEL_ID} router." + printf "\nThe USB drive was likely in a busy state.\n" + } > "$tempEMailBodyMsg" + ;; SUCCESS_SCRIPT_UPDATE_STATUS) if [ -s "$SCRIPT_VERPATH" ] then @@ -8842,6 +8849,7 @@ _Unmount_Eject_USB_Drives_() else _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired." _MsgToSysLog_ "Unable to unmount USB drive. Device is likely busy." + _SendEMailNotification_ FAILED_USB_DRIVE_UNMOUNT fi _MsgToSysLog_ "END of ${logMsg}." From 4154feefa65c5bcc07bf735aa3f4cb1c825d7f48 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Wed, 12 Nov 2025 08:17:51 -0500 Subject: [PATCH 06/11] Add GT-BE19000AI to supported models list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 96afc249..952aa424 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ ## SUPPORTED MERLIN MODELS (Multi-image models) - i.e. Any model that uses a .w or a .pkgtb file + - GT-BE19000AI - GT-BE98_PRO - GT-AX6000 - GT-AXE16000 From 6e4df389472785e5c13001b864353a8ff687c4bc Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Wed, 12 Nov 2025 08:18:32 -0500 Subject: [PATCH 07/11] Fix formatting of RT-BE58 model in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 952aa424..b0ec690b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ - RT-BE96U - RT-BE88U - RT-BE86U - - RT-BE58 Go​ + - RT-BE58_GO​ - RT-AX88U_PRO - RT-AX88U - RT-AC86U From a11bfa2c65a25e2839497044c69f16ee328f290e Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 16 Nov 2025 21:00:57 -0800 Subject: [PATCH 08/11] Code Improvements Modified code to make sure we get correct parameters when changing settings from the WebUI. --- MerlinAU.sh | 14 +++++++------- README.md | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 7e5edf67..c21b41f6 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,13 +4,13 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Nov-10 +# Last Modified: 2025-Nov-16 ################################################################### set -u ## Set version for each Production Release ## readonly SCRIPT_VERSION=1.5.7 -readonly SCRIPT_VERSTAG="25111020" +readonly SCRIPT_VERSTAG="25111620" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -2544,9 +2544,9 @@ _WebUI_SetEmailConfigFileFromAMTM_() _WriteVarDefToHelperJSFile_ "isEMailConfigEnabledInAMTM" "$isEMailConfigEnabledInAMTM" true } -##------------------------------------------## -## Modified by ExtremeFiretop [2025-May-21] ## -##------------------------------------------## +##----------------------------------------## +## Modified by Martinski W. [2025-Nov-16] ## +##----------------------------------------## _ActionsAfterNewConfigSettings_() { if [ ! -s "${CONFIG_FILE}.bak" ] || \ @@ -2555,7 +2555,7 @@ _ActionsAfterNewConfigSettings_() _ConfigOptionChanged_() { - if diff "$CONFIG_FILE" "${CONFIG_FILE}.bak" | grep -q "$1" + if diff -U0 "$CONFIG_FILE" "${CONFIG_FILE}.bak" | grep -q "$1" then return 0 else return 1 fi @@ -11333,7 +11333,7 @@ _Gnuton_Check_Webs_Update_Script_() # (Re)bind/mount only if remote is newer version OR files differ # if [ "$remoteVersTag" -gt "$localVersTag" ] || \ - ! diff "$FW_UpdateCheckScript" "$dwnldGnutonWebsUpdateFilePath" >/dev/null 2>&1 + ! diff -q "$FW_UpdateCheckScript" "$dwnldGnutonWebsUpdateFilePath" >/dev/null 2>&1 then umount "$FW_UpdateCheckScript" 2>/dev/null mv -f "$dwnldGnutonWebsUpdateFilePath" "$fixedGnutonWebsUpdateFilePath" diff --git a/README.md b/README.md index b0ec690b..1e17d61a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater ## v1.5.7 -## 2025-Nov-10 +## 2025-Nov-16 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e) From dd1c3c9c380db6df050c21de1f5cfeb337ce3455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Nov 2025 23:11:38 +0000 Subject: [PATCH 09/11] Bump actions/checkout from 5.0.0 to 5.0.1 in the all-actions group Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 5.0.0 to 5.0.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 5.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index a21267d1..05be0de0 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@v5.0.0 + uses: actions/checkout@v5.0.1 with: fetch-depth: 0 ref: 'main' # Ensure we're tagging the main branch after the merge From a111d0a170fd1d4c0f86d3da4876660791a0ad74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 23:35:29 +0000 Subject: [PATCH 10/11] Bump actions/checkout from 5.0.1 to 6.0.0 in the all-actions group Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 5.0.1 to 6.0.0 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5.0.1...v6.0.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 05be0de0..0cd286d9 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@v5.0.1 + uses: actions/checkout@v6.0.0 with: fetch-depth: 0 ref: 'main' # Ensure we're tagging the main branch after the merge From 05887b6bcb05d6a49f2678db4c6ff00352ea876e Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Tue, 25 Nov 2025 22:40:48 -0500 Subject: [PATCH 11/11] Update release date in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e17d61a..5236d0e9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater ## v1.5.7 -## 2025-Nov-16 +## 2025-Nov-25 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)