Skip to content

Dev 1.6.5 as Next Stable Release#584

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.

Sign up for GitHub

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

Merged
ExtremeFiretop merged 9 commits into from
Jun 24, 2026
Merged

Dev 1.6.5 as Next Stable Release #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4cd7327
Merge pull request #580 from ExtremeFiretop/main
ExtremeFiretop Jun 22, 2026
09a4e60
Fix log cleanup function to create directory and restore logs
ExtremeFiretop Jun 22, 2026
28bce87
Update script version and branch for development
ExtremeFiretop Jun 22, 2026
7a3be17
Update MerlinAU.sh
ExtremeFiretop Jun 22, 2026
6fbec6f
Bump the all-actions group with 2 updates
dependabot[bot] Jun 22, 2026
c97d27e
Merge pull request #582 from ExtremeFiretop/dependabot/github_actions…
ExtremeFiretop Jun 23, 2026
18b2f39
Merge pull request #581 from ExtremeFiretop/ExtremeFiretop-patch-1
Martinski4GitHub Jun 23, 2026
58f2539
Improvements and Clean Up
Martinski4GitHub Jun 23, 2026
d7bd832
Merge pull request #583 from Martinski4GitHub/dev
ExtremeFiretop Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Create-NewReleases.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v6.0.3
uses: actions/checkout@v7.0.0
with:
fetch-depth: 0
ref: 'main' # Ensure we're tagging the main branch after the merge
Expand DownExpand Up@@ -85,7 +85,7 @@ jobs:
git push origin ${{ steps.nextver.outputs.tag }}

- name: Create Release with Automated Release Notes
uses: softprops/action-gh-release@v3.0.0
uses: softprops/action-gh-release@v3.0.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ steps.nextver.outputs.tag }}
Expand Down
21 changes: 11 additions & 10 deletions MerlinAU.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,16 +4,16 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2026-Jun-11
# Last Modified: 2026-Jun-23
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.6.4
readonly SCRIPT_VERSTAG="26061118"
readonly SCRIPT_VERSION=1.6.5
readonly SCRIPT_VERSTAG="26062300"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="master"
SCRIPT_BRANCH="dev"

##----------------------------------------##
## Modified by Martinski W. [2024-Jul-03] ##
Expand DownExpand Up@@ -2245,13 +2245,13 @@ readonly POST_REBOOT_SCRIPT_HOOK="[ -x $ScriptFilePath ] && $POST_REBOOT_SCRIPT_
readonly POST_UPDATE_EMAIL_SCRIPT_JOB="$ScriptFilePath postUpdateEmail &"
readonly POST_UPDATE_EMAIL_SCRIPT_HOOK="[ -x $ScriptFilePath ] && $POST_UPDATE_EMAIL_SCRIPT_JOB $hookScriptTagStr"

##------------------------------------------##
## Modified by ExtremeFiretop [2026-Jun-10] ##
##------------------------------------------##
##----------------------------------------##
## Modified by Martinski W. [2026-Jun-23] ##
##----------------------------------------##
_CleanUpOldLogFiles_()
{
[ ! -d "$FW_LOG_DIR" ] && return 1
local numLogFiles topLogFile savedTopLogFile=""
[ ! -d "$FW_LOG_DIR" ] && return 0
local retCode numLogFiles topLogFile savedTopLogFile=""

numLogFiles="$(ls -1lt "$FW_LOG_DIR"/*.log 2>/dev/null | wc -l)"
# Leave one log file (if any available) #
Expand All@@ -2271,6 +2271,7 @@ _CleanUpOldLogFiles_()

# Delete logs older than 30 days #
/usr/bin/find -L "$FW_LOG_DIR" -name '*.log' -mtime +30 -exec rm {} \;
retCode="$?"

# Restore the most recent log file #
if [ -n "$topLogFile" ] && \
Expand All@@ -2282,7 +2283,7 @@ _CleanUpOldLogFiles_()
return 1
fi
fi
return 0
return "$retCode"
}

##----------------------------------------##
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater

## v1.6.4
## 2026-June-21
## v1.6.5
## 2026-June-23

## WebUI:
<img width="775" height="1640" alt="image" src="https://github.com/user-attachments/assets/846f889b-b39f-4ffe-a37a-8892ad9b2f7f" />
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.6.4
1.6.5