Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/Create-NewReleases.yml
Original file line number Diff line number Diff line change
Expand 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.2
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ steps.nextver.outputs.tag }}
Expand Down
121 changes: 0 additions & 121 deletions .github/workflows/update-merlin-sha256.yml

This file was deleted.

15 changes: 7 additions & 8 deletions MerlinAU.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.6.7
readonly SCRIPT_VERSTAG="26090309"
readonly SCRIPT_VERSION=1.6.8
readonly SCRIPT_VERSTAG="26090718"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="master"
SCRIPT_BRANCH="dev"

##----------------------------------------##
## Modified by Martinski W. [2024-Jul-03] ##
Expand All @@ -37,8 +37,7 @@ readonly FW_SFURL_BASE="https://sourceforge.net/projects/asuswrt-merlin/files"
readonly FW_SFURL_RELEASE_SUFFIX="Release"
readonly FW_GITURL_RELEASE="https://api.github.com/repos/gnuton/asuswrt-merlin.ng/releases/latest"
readonly FW_SHA256_URL="https://www.asuswrt-merlin.net/download"
# The scheduled checksum mirror is maintained on the repository's default branch #
readonly FW_SHA256_MIRROR_URL="${SCRIPT_URL_BASE}/main/merlin-sha256.txt"
readonly FW_SHA256_MIRROR_URL="https://fwupdate.asuswrt-merlin.net/sha256sums-ng.txt"

##----------------------------------------##
## Modified by Martinski W. [2024-May-31] ##
Expand Down Expand Up @@ -6119,7 +6118,7 @@ _CheckOnlineFirmwareSHA256_()
Say "${MGNTct}*WARNING*${NOct}: Independently published checksum signature could NOT be retrieved from the ASUSWRT-Merlin website."

#-----------------------------------------------------------------------#
# SECONDARY SOURCE: Use the repository mirror ONLY when the official
# SECONDARY SOURCE: Use the official mirror ONLY when the Merlin Website
# source did NOT yield a usable checksum. Never use a checksum bundled
# with the firmware image in the ZIP archive for an online F/W update.
#-----------------------------------------------------------------------#
Expand All @@ -6141,8 +6140,8 @@ _CheckOnlineFirmwareSHA256_()
return 1
fi

checksumSource="MerlinAU GitHub repository mirror"
Say "${MGNTct}*WARNING*${NOct}: Using the MerlinAU GitHub checksum mirror for verification (15-MINUTE Update Intervals!)"
checksumSource="FwUpdate VPS mirror"
Say "${MGNTct}*WARNING*${NOct}: Using the FwUpdate VPS checksum mirror for verification."
fi

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

## v1.6.7
## 2026-Sep-03
## v1.6.8
## 2026-Sep-07

## 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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.7
1.6.8