From 74c333e926db94cd4971bac6cc0961f0b5aacfbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 08:43:41 +0000 Subject: [PATCH 1/2] 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 2962058..3e950ee 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - 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 b84e942e293ab142d662bb2b9cc666b14a580f6b Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Mon, 10 Nov 2025 11:40:44 -0500 Subject: [PATCH 2/2] Add prerequisites for ntpMerlin installation Added prerequisites section to README.md. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 16779bf..512b717 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,11 @@ Using your preferred SSH client/terminal, copy and paste the following command, /usr/sbin/curl --retry 3 "https://raw.githubusercontent.com/AMTM-OSR/ntpMerlin/master/ntpmerlin.sh" -o "/jffs/scripts/ntpmerlin" && chmod 0755 /jffs/scripts/ntpmerlin && /jffs/scripts/ntpmerlin install ``` +## Prerequisites +Asuswrt-Merlin running on a supported ASUS router +Entware installed, preferably using amtm +jffs scripts enabled in the firmware; installing Entware should have taken care of this part + ## Usage ### WebUI ntpMerlin can be configured via the WebUI, in the Addons section.