From a9db134d3ad753ce7278e9b64d47fff501a12127 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 26 Apr 2026 13:24:40 +0200
Subject: [PATCH] version updates

---
 .github/workflows/dev_release.yml     | 21 ++++++++++++++-----
 .github/workflows/stable_release.yml  | 30 +++++++++++++++++++++------
 .github/workflows/update_versions.yml | 25 +++++++++++++++-------
 3 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/dev_release.yml b/.github/workflows/dev_release.yml
index 3a66fede2..97e4f5ffc 100644
--- a/.github/workflows/dev_release.yml
+++ b/.github/workflows/dev_release.yml
@@ -79,9 +79,20 @@ jobs:
             ./build/firmware/*.*
 
       - name: Update version in Cloudflare KV store
+        env:
+          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+          CF_NAMESPACE_ID: ${{ secrets.CF_NAMESPACE_ID }}
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+          VERSION: ${{ steps.build_info.outputs.VERSION }}
         run: |
-          JSON_DATA="{\"version\": \"${{steps.build_info.outputs.VERSION}}\", \"date\": \"$(date -u +%Y-%m-%dT%H:%M:%SZ)\"}"
-          curl -X PUT "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ACCOUNT_ID }}/storage/kv/namespaces/${{ secrets.CF_NAMESPACE_ID }}/values/dev" \
-               -H "Authorization: Bearer ${{ secrets.CF_API_TOKEN }}" \
-               -H "Content-Type: text/plain" \
-               -d "$JSON_DATA"
+          JSON_DATA=$(jq -n \
+            --arg version "$VERSION" \
+            --arg date "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+            '{version: $version, date: $date}')
+          echo "JSON_DATA: $JSON_DATA"
+          curl -sS --fail-with-body \
+            -X PUT "https://api.cloudflare.com/client/v4/accounts/${CF_ACCOUNT_ID}/storage/kv/namespaces/${CF_NAMESPACE_ID}/values/dev" \
+            -H "Authorization: Bearer ${CF_API_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON_DATA"
+          echo
diff --git a/.github/workflows/stable_release.yml b/.github/workflows/stable_release.yml
index 84df90706..a5fe7b7ae 100644
--- a/.github/workflows/stable_release.yml
+++ b/.github/workflows/stable_release.yml
@@ -27,10 +27,17 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v6
-  
+
       - name: Enable Corepack
         run: corepack enable pnpm
 
+
+      - name: Get the EMS-ESP version
+        id: build_info
+        run: |
+          version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'`
+          echo "VERSION=$version" >> $GITHUB_OUTPUT
+
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
@@ -63,9 +70,20 @@ jobs:
             ./build/firmware/*.*
 
       - name: Update version in Cloudflare KV store
+        env:
+          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+          CF_NAMESPACE_ID: ${{ secrets.CF_NAMESPACE_ID }}
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+          VERSION: ${{ steps.build_info.outputs.VERSION }}
         run: |
-          JSON_DATA="{\"version\": \"${{ github.event.release.tag_name }}\", \"date\": \"$(date -u +%Y-%m-%dT%H:%M:%SZ)\"}"
-          curl -X PUT "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ACCOUNT_ID }}/storage/kv/namespaces/${{ secrets.CF_NAMESPACE_ID }}/values/stable" \
-               -H "Authorization: Bearer ${{ secrets.CF_API_TOKEN }}" \
-               -H "Content-Type: text/plain" \
-               -d "$JSON_DATA"
+          JSON_DATA=$(jq -n \
+            --arg version "$VERSION" \
+            --arg date "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+            '{version: $version, date: $date}')
+          echo "JSON_DATA: $JSON_DATA"
+          curl -sS --fail-with-body \
+            -X PUT "https://api.cloudflare.com/client/v4/accounts/${CF_ACCOUNT_ID}/storage/kv/namespaces/${CF_NAMESPACE_ID}/values/stable" \
+            -H "Authorization: Bearer ${CF_API_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON_DATA"
+          echo
diff --git a/.github/workflows/update_versions.yml b/.github/workflows/update_versions.yml
index 6bceead5e..e246f84c2 100644
--- a/.github/workflows/update_versions.yml
+++ b/.github/workflows/update_versions.yml
@@ -11,11 +11,14 @@ jobs:
     name: 'Update versions in Cloudflare KV store'
     runs-on: ubuntu-latest
     steps:
-        
       - name: Checkout repository
         uses: actions/checkout@v6
-  
+
       - name: Get and Send EMS-ESP version to Cloudflare
+        env:
+          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+          CF_NAMESPACE_ID: ${{ secrets.CF_NAMESPACE_ID }}
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
         run: |
           version=$(grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}')
           if [ "$GITHUB_REF" = "refs/heads/main" ]; then
@@ -23,9 +26,15 @@ jobs:
           else
             KV_ENV="dev"
           fi
-          JSON_DATA="{\"version\": \"${version}\", \"date\": \"$(date -u +%Y-%m-%dT%H:%M:%SZ)\"}"
-          curl -X PUT "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ACCOUNT_ID }}/storage/kv/namespaces/${{ secrets.CF_NAMESPACE_ID }}/values/$KV_ENV" \
-               -H "Authorization: Bearer ${{ secrets.CF_API_TOKEN }}" \
-               -H "Content-Type: text/plain" \
-               -d "$JSON_DATA"
-          
\ No newline at end of file
+          JSON_DATA=$(jq -n \
+            --arg version "$version" \
+            --arg date "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+            '{version: $version, date: $date}')
+          echo "KV_ENV: $KV_ENV"
+          echo "JSON_DATA: $JSON_DATA"
+          curl -sS --fail-with-body \
+            -X PUT "https://api.cloudflare.com/client/v4/accounts/${CF_ACCOUNT_ID}/storage/kv/namespaces/${CF_NAMESPACE_ID}/values/${KV_ENV}" \
+            -H "Authorization: Bearer ${CF_API_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON_DATA"
+          echo