fix: Update PHP version regex to support alpine 3.23+
All checks were successful
Helm Chart Release / release-chart (push) Successful in 12s
All checks were successful
Helm Chart Release / release-chart (push) Successful in 12s
Alpine Linuxのマイナーバージョンが3.23など3桁になったため、
正規表現パターンを修正。
Changes:
- 正規表現を `[0-9]+` から `[0-9]{2,3}` に変更
- alpine3.22 と alpine3.23 の両方に対応
- エラーメッセージにデバッグ情報を追加
Fixes: PHP version check failure in Gitea Actions workflow
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -48,26 +48,26 @@ jobs:
|
|||||||
echo "Checking PHP versions..."
|
echo "Checking PHP versions..."
|
||||||
CURRENT=$(grep -A3 "php:" values.yaml | grep "tag:" | head -1 | sed 's/.*tag: *"\([^"]*\)".*/\1/' | tr -d ' ')
|
CURRENT=$(grep -A3 "php:" values.yaml | grep "tag:" | head -1 | sed 's/.*tag: *"\([^"]*\)".*/\1/' | tr -d ' ')
|
||||||
echo "Current PHP: $CURRENT"
|
echo "Current PHP: $CURRENT"
|
||||||
|
|
||||||
# Docker Hub API v2を使用してタグを取得
|
# Docker Hub API v2を使用してタグを取得
|
||||||
# パターン: 8.4.12-fpm-alpine3.22 形式
|
# パターン: 8.5.2-fpm-alpine3.23 形式(alpineバージョンは2-3桁に対応)
|
||||||
LATEST=$(curl -s "https://registry.hub.docker.com/v2/repositories/library/php/tags?page_size=100" | \
|
LATEST=$(curl -s "https://registry.hub.docker.com/v2/repositories/library/php/tags?page_size=100" | \
|
||||||
jq -r '.results[].name' | \
|
jq -r '.results[].name' | \
|
||||||
grep -E '^[0-9]+\.[0-9]+\.[0-9]+-fpm-alpine[0-9]+\.[0-9]+$' | \
|
grep -E '^[0-9]+\.[0-9]+\.[0-9]+-fpm-alpine[0-9]+\.[0-9]{2,3}$' | \
|
||||||
sort -V | tail -1)
|
sort -V | tail -1)
|
||||||
|
|
||||||
if [ -z "$LATEST" ]; then
|
if [ -z "$LATEST" ]; then
|
||||||
echo "Warning: Could not fetch latest PHP version, using current"
|
echo "Warning: Could not fetch latest PHP version, using current"
|
||||||
LATEST="$CURRENT"
|
LATEST="$CURRENT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# PHPバージョンを抽出 (8.4.12の部分)
|
# PHPバージョンを抽出 (8.5.2の部分)
|
||||||
APP_VERSION=$(echo "$LATEST" | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+')
|
APP_VERSION=$(echo "$LATEST" | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+')
|
||||||
if [ -z "$APP_VERSION" ]; then
|
if [ -z "$APP_VERSION" ]; then
|
||||||
echo "Error: Could not extract PHP version"
|
echo "Error: Could not extract PHP version from: $LATEST"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Latest PHP: $LATEST"
|
echo "Latest PHP: $LATEST"
|
||||||
echo "PHP version: $APP_VERSION"
|
echo "PHP version: $APP_VERSION"
|
||||||
echo "current=$CURRENT" >> $GITHUB_OUTPUT
|
echo "current=$CURRENT" >> $GITHUB_OUTPUT
|
||||||
|
|||||||
Reference in New Issue
Block a user