From a41d6ff4e0e2f6433a46eaf8d8ffc2a850b8d0b8 Mon Sep 17 00:00:00 2001 From: Derek Kaser <11674153+dkaser@users.noreply.github.com> Date: Fri, 9 May 2025 02:15:32 +0000 Subject: [PATCH 1/6] ci: update github references --- tools/build-plugin.sh | 6 +++--- tools/plugin/files/CHANGELOG.md | 2 +- tools/plugin/tailscale.json | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/build-plugin.sh b/tools/build-plugin.sh index d37e214..0a52903 100755 --- a/tools/build-plugin.sh +++ b/tools/build-plugin.sh @@ -1,5 +1,5 @@ #!/bin/sh -FILENAME=tailscale; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch main plugin/tailscale.j2 > ../plugin/$FILENAME.plg -FILENAME=tailscale-preview; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch preview plugin/tailscale.j2 > ../plugin/$FILENAME.plg -FILENAME=tailscale-trunk; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch trunk plugin/tailscale.j2 > ../plugin/$FILENAME.plg \ No newline at end of file +FILENAME=tailscale; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch main -D githubRepository "$GITHUB_REPOSITORY" plugin/tailscale.j2 > ../plugin/$FILENAME.plg +FILENAME=tailscale-preview; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch preview -D githubRepository "$GITHUB_REPOSITORY" plugin/tailscale.j2 > ../plugin/$FILENAME.plg +FILENAME=tailscale-trunk; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch trunk -D githubRepository "$GITHUB_REPOSITORY" plugin/tailscale.j2 > ../plugin/$FILENAME.plg \ No newline at end of file diff --git a/tools/plugin/files/CHANGELOG.md b/tools/plugin/files/CHANGELOG.md index a7408af..bc6eebc 100644 --- a/tools/plugin/files/CHANGELOG.md +++ b/tools/plugin/files/CHANGELOG.md @@ -16,4 +16,4 @@ - Update Tailscale to 1.82.0 -For older releases, see https://github.com/unraid/unraid-tailscale/releases +For older releases, see https://github.com/{{ githubRepository }}/releases diff --git a/tools/plugin/tailscale.json b/tools/plugin/tailscale.json index d80e7fb..9c185b4 100644 --- a/tools/plugin/tailscale.json +++ b/tools/plugin/tailscale.json @@ -1,7 +1,6 @@ { "name": "tailscale", "author": "Derek Kaser", - "githubRepository": "unraid/unraid-tailscale", "version": "2025.05.08", "tailscaleVersion": "tailscale_1.82.5_amd64", "tailscaleSHA256": "41a8931fa52055bd7ea4b51df9acff2ba2d4e9000c2380b667539b5b99991464", From 84dbc5e44ca9d1f862c8082baa507705ea45033d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 May 2025 02:15:45 +0000 Subject: [PATCH 2/6] ci: template plugin files --- plugin/tailscale-preview.plg | 4 ++-- plugin/tailscale-trunk.plg | 4 ++-- plugin/tailscale.plg | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin/tailscale-preview.plg b/plugin/tailscale-preview.plg index 56d46aa..b41e9ec 100644 --- a/plugin/tailscale-preview.plg +++ b/plugin/tailscale-preview.plg @@ -5,7 +5,7 @@ name="tailscale" author="Derek Kaser" version="2025.05.08" - pluginURL="https://raw.githubusercontent.com/unraid/unraid-tailscale/preview/plugin/tailscale-preview.plg" + pluginURL="https://raw.githubusercontent.com/dkaser/unraid-tailscale/preview/plugin/tailscale-preview.plg" launch="Settings/Tailscale" support="https://forums.unraid.net/topic/136889-plugin-tailscale/" min="7.0.0" @@ -31,7 +31,7 @@ - Update Tailscale to 1.82.0 -For older releases, see https://github.com/unraid/unraid-tailscale/releases +For older releases, see https://github.com/dkaser/unraid-tailscale/releases ]]> diff --git a/plugin/tailscale-trunk.plg b/plugin/tailscale-trunk.plg index 8c35895..d7829ec 100644 --- a/plugin/tailscale-trunk.plg +++ b/plugin/tailscale-trunk.plg @@ -5,7 +5,7 @@ name="tailscale" author="Derek Kaser" version="2025.05.08" - pluginURL="https://raw.githubusercontent.com/unraid/unraid-tailscale/trunk/plugin/tailscale-trunk.plg" + pluginURL="https://raw.githubusercontent.com/dkaser/unraid-tailscale/trunk/plugin/tailscale-trunk.plg" launch="Settings/Tailscale" support="https://forums.unraid.net/topic/136889-plugin-tailscale/" min="7.0.0" @@ -31,7 +31,7 @@ - Update Tailscale to 1.82.0 -For older releases, see https://github.com/unraid/unraid-tailscale/releases +For older releases, see https://github.com/dkaser/unraid-tailscale/releases ]]> diff --git a/plugin/tailscale.plg b/plugin/tailscale.plg index 2658167..036aeee 100644 --- a/plugin/tailscale.plg +++ b/plugin/tailscale.plg @@ -5,7 +5,7 @@ name="tailscale" author="Derek Kaser" version="2025.05.08" - pluginURL="https://raw.githubusercontent.com/unraid/unraid-tailscale/main/plugin/tailscale.plg" + pluginURL="https://raw.githubusercontent.com/dkaser/unraid-tailscale/main/plugin/tailscale.plg" launch="Settings/Tailscale" support="https://forums.unraid.net/topic/136889-plugin-tailscale/" min="7.0.0" @@ -31,7 +31,7 @@ - Update Tailscale to 1.82.0 -For older releases, see https://github.com/unraid/unraid-tailscale/releases +For older releases, see https://github.com/dkaser/unraid-tailscale/releases ]]> From 8d1380c77597118d1d71514ba415ecf2eb6c7c53 Mon Sep 17 00:00:00 2001 From: Derek Kaser <11674153+dkaser@users.noreply.github.com> Date: Fri, 9 May 2025 02:17:39 +0000 Subject: [PATCH 3/6] fix: package ref --- tools/plugin/tailscale.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/plugin/tailscale.j2 b/tools/plugin/tailscale.j2 index b8a4390..70e4064 100644 --- a/tools/plugin/tailscale.j2 +++ b/tools/plugin/tailscale.j2 @@ -23,7 +23,7 @@ -https://github.com/unraid/unraid-tailscale-utils/releases/download/{{ packageVersion }}/unraid-tailscale-utils-{{ packageVersion }}-noarch-1.txz +https://github.com/{{ githubRepository }}-utils/releases/download/{{ packageVersion }}/unraid-tailscale-utils-{{ packageVersion }}-noarch-1.txz {{ packageSHA256 }} From 50dc77d6e80a6004f52468b6aac5931b30aa08af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 May 2025 02:17:53 +0000 Subject: [PATCH 4/6] ci: template plugin files --- plugin/tailscale-preview.plg | 2 +- plugin/tailscale-trunk.plg | 2 +- plugin/tailscale.plg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/tailscale-preview.plg b/plugin/tailscale-preview.plg index b41e9ec..a636893 100644 --- a/plugin/tailscale-preview.plg +++ b/plugin/tailscale-preview.plg @@ -42,7 +42,7 @@ For older releases, see https://github.com/dkaser/unraid-tailscale/releases -https://github.com/unraid/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz +https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz 05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38 diff --git a/plugin/tailscale-trunk.plg b/plugin/tailscale-trunk.plg index d7829ec..10c7b75 100644 --- a/plugin/tailscale-trunk.plg +++ b/plugin/tailscale-trunk.plg @@ -42,7 +42,7 @@ For older releases, see https://github.com/dkaser/unraid-tailscale/releases -https://github.com/unraid/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz +https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz 05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38 diff --git a/plugin/tailscale.plg b/plugin/tailscale.plg index 036aeee..ca64dc6 100644 --- a/plugin/tailscale.plg +++ b/plugin/tailscale.plg @@ -42,7 +42,7 @@ For older releases, see https://github.com/dkaser/unraid-tailscale/releases -https://github.com/unraid/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz +https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz 05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38 From fdb2f4fa390cfb39d98580522f4aa4968ec6563e Mon Sep 17 00:00:00 2001 From: Derek Kaser <11674153+dkaser@users.noreply.github.com> Date: Fri, 9 May 2025 02:21:11 +0000 Subject: [PATCH 5/6] fix: sha --- tools/plugin/tailscale.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/plugin/tailscale.json b/tools/plugin/tailscale.json index 9c185b4..f6ec8e3 100644 --- a/tools/plugin/tailscale.json +++ b/tools/plugin/tailscale.json @@ -5,7 +5,7 @@ "tailscaleVersion": "tailscale_1.82.5_amd64", "tailscaleSHA256": "41a8931fa52055bd7ea4b51df9acff2ba2d4e9000c2380b667539b5b99991464", "packageVersion": "4.0.2", - "packageSHA256": "05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38", + "packageSHA256": "714aa295ab9d1bf0287a0a60b0fa9727dff7a7ebce559f6e4b57fa430a07c8ad", "pluginDirectory": "/usr/local/emhttp/plugins/tailscale", "configDirectory": "/boot/config/plugins/tailscale", "minver": "7.0.0" From 49719d6b9aacabf86088781819f12a3ab08fdcc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 May 2025 02:21:23 +0000 Subject: [PATCH 6/6] ci: template plugin files --- plugin/tailscale-preview.plg | 2 +- plugin/tailscale-trunk.plg | 2 +- plugin/tailscale.plg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/tailscale-preview.plg b/plugin/tailscale-preview.plg index a636893..2ea838b 100644 --- a/plugin/tailscale-preview.plg +++ b/plugin/tailscale-preview.plg @@ -43,7 +43,7 @@ For older releases, see https://github.com/dkaser/unraid-tailscale/releases https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz -05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38 +714aa295ab9d1bf0287a0a60b0fa9727dff7a7ebce559f6e4b57fa430a07c8ad