From 20081bdda92b207f3bab93250a7f067fa73eea0b Mon Sep 17 00:00:00 2001
From: Claude <claude@cafepieters.com>
Date: Thu, 12 Feb 2026 08:18:06 +0900
Subject: [PATCH] fix: Update both version and appVersion in Chart.yaml during
 WordPress updates

When WordPress version changes, both Chart.yaml fields should be updated to match:
- version: WordPress version (e.g., 6.9.4)
- appVersion: WordPress version (e.g., 6.9.4)

Previously only 'version' was updated while 'appVersion' remained stale.

Changes:
- Extract current appVersion before update
- Update appVersion with sed command (in addition to version)
- Log both version and appVersion changes

This ensures Chart.yaml always reflects the actual WordPress version deployed.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .gitea/workflows/image-update-and-release.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/image-update-and-release.yaml b/.gitea/workflows/image-update-and-release.yaml
index da4e767..f34e991 100644
--- a/.gitea/workflows/image-update-and-release.yaml
+++ b/.gitea/workflows/image-update-and-release.yaml
@@ -227,14 +227,19 @@ jobs:
           # WordPressバージョン更新時は新しいWPバージョンをそのまま使用（サフィックスは付けない）
           if [ -f Chart.yaml ]; then
             CURRENT_CHART_VERSION=$(grep '^version:' Chart.yaml | awk '{print $2}')
-            # values.yamlの新しいWordPressバージョンを取得（appVersionではなくimageタグから）
+            CURRENT_APP_VERSION=$(grep '^appVersion:' Chart.yaml | awk '{print $2}' | tr -d '"')
+
+            # values.yamlの新しいWordPressバージョンを取得（imageタグから）
             NEW_WP_VERSION=$(grep -A 3 'wordpress:' values.yaml | grep 'tag:' | awk -F'"' '{print $2}' | cut -d'-' -f1)
 
-            # Chart.yamlはWordPressバージョンに合わせて更新（サフィックスなし）
+            # Chart.yamlはWordPressバージョンに合わせて更新（version と appVersion を同じにする）
             NEW_CHART_VERSION="$NEW_WP_VERSION"
 
             sed -i "s/^version: .*/version: $NEW_CHART_VERSION/" Chart.yaml
+            sed -i "s/^appVersion: .*/appVersion: \"$NEW_WP_VERSION\"/" Chart.yaml
+
             echo "Chart version updated: $CURRENT_CHART_VERSION -> $NEW_CHART_VERSION"
+            echo "Chart appVersion updated: $CURRENT_APP_VERSION -> $NEW_WP_VERSION"
             echo "new_chart_version=$NEW_CHART_VERSION" >> $GITHUB_OUTPUT
           else
             echo "Chart.yaml not found, skipping version increment"