From cfc2a96a459318e7fe8a41f9ed9c997ef08b19a7 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 8 Apr 2025 10:09:23 -0400
Subject: [PATCH] Update web, use centrally defined version (#6500)

---
 .github/actions/build-variant/action.yml | 9 ++++++++-
 bin/rpkg.macros                          | 4 ++++
 bin/web.version                          | 1 +
 debian/ci_pack_sdeb.sh                   | 5 +++--
 meshtasticd.spec.rpkg                    | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 bin/web.version

diff --git a/.github/actions/build-variant/action.yml b/.github/actions/build-variant/action.yml
index 2f0883fad..67d002eea 100644
--- a/.github/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -43,6 +43,13 @@ runs:
       id: base
       uses: ./.github/actions/setup-base
 
+    - name: Get web ui version
+      if: inputs.include-web-ui == 'true'
+      id: webver
+      shell: bash
+      run: |
+        echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT
+
     - name: Pull web ui
       if: inputs.include-web-ui == 'true'
       uses: dsaltares/fetch-gh-release-asset@master
@@ -51,7 +58,7 @@ runs:
         file: build.tar
         target: build.tar
         token: ${{ inputs.github_token }}
-        version: tags/v2.5.3
+        version: tags/v${{ steps.webver.outputs.ver }}
 
     - name: Unpack web ui
       if: inputs.include-web-ui == 'true'
diff --git a/bin/rpkg.macros b/bin/rpkg.macros
index 2bbb203de..aa036fc33 100644
--- a/bin/rpkg.macros
+++ b/bin/rpkg.macros
@@ -2,6 +2,10 @@ function meshtastic_version {
     meshtastic_version=$(python3 bin/buildinfo.py short)
     echo -n "$meshtastic_version"
 }
+function web_version {
+    web_version=$(cat bin/web.version)
+    echo -n "$web_version"
+}
 function git_commits_num {
     total_commits=$(git rev-list --all --count)
     echo -n "$total_commits"
diff --git a/bin/web.version b/bin/web.version
new file mode 100644
index 000000000..914ec9671
--- /dev/null
+++ b/bin/web.version
@@ -0,0 +1 @@
+2.6.0
\ No newline at end of file
diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh
index a8b2252ae..c0cea0010 100755
--- a/debian/ci_pack_sdeb.sh
+++ b/debian/ci_pack_sdeb.sh
@@ -10,8 +10,9 @@ platformio pkg install -e native -t platformio/tool-scons@4.40502.0
 # Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio
-# Download the latest meshtastic/web release build.tar to `web.tar`
-curl -L https://github.com/meshtastic/web/releases/latest/download/build.tar -o web.tar
+# Download the meshtastic/web release build.tar to `web.tar`
+web_ver=$(cat bin/web.version)
+curl -L "https://github.com/meshtastic/web/releases/download/v$web_ver/build.tar" -o web.tar
 
 package=$(dpkg-parsechangelog --show-field Source)
 
diff --git a/meshtasticd.spec.rpkg b/meshtasticd.spec.rpkg
index a09261056..4d6c9d6f5 100644
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -21,7 +21,7 @@ Summary:        Meshtastic daemon for communicating with Meshtastic devices
 License:        GPL-3.0
 URL:            https://github.com/meshtastic/firmware
 Source0:        {{{ git_dir_pack }}}
-Source1:        https://github.com/meshtastic/web/releases/latest/download/build.tar
+Source1:        https://github.com/meshtastic/web/releases/download/v{{{ web_version }}}/build.tar
 
 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel