🐛 fix(ci): 修复 Doris driver-agent revision 校验失败

- 统一 release/dev 构建流程中的 Doris/diros 驱动归一 - 保持 Doris 资产名为 doris，构建 tag 使用 gonavi_diros_driver - 优化 driver-agent revision 校验失败日志，避免输出 JSON 解析 traceback
2026-08-19 05:14:09 +08:00 · 2026-06-28 08:35:05 +08:00
parent 7453600ee5
commit 793e078676
3 changed files with 112 additions and 16 deletions
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -588,7 +588,45 @@ jobs:
          export GOCACHE="${RUNNER_TEMP}/go-build-${{ matrix.os_name }}-${{ matrix.arch_name }}-${REVISION_HASH}"
          mkdir -p "$GOCACHE"
          echo "🧭 可选驱动使用隔离 GOCACHE：$GOCACHE"
-          IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          normalize_driver_token() {
+            local value
+            value="$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+            case "$value" in
+              "") return 1 ;;
+              doris|diros) echo "doris" ;;
+              open_gauss|open-gauss) echo "opengauss" ;;
+              gaussdb|gauss_db|gauss-db) echo "gaussdb" ;;
+              elastic|elasticsearch) echo "elasticsearch" ;;
+              mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|opengauss|gaussdb|iris|mongodb|tdengine|iotdb|clickhouse)
+                echo "$value"
+                ;;
+              *)
+                echo "❌ 不支持的 driver-agent：${1:-}" >&2
+                return 1
+                ;;
+            esac
+          }
+
+          build_driver_name() {
+            case "$1" in
+              doris) echo "diros" ;;
+              *) echo "$1" ;;
+            esac
+          }
+
+          declare -a RAW_DRIVERS=()
+          declare -a DRIVERS=()
+          IFS=',' read -r -a RAW_DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          for RAW_DRIVER in "${RAW_DRIVERS[@]}"; do
+            DRIVER="$(normalize_driver_token "$RAW_DRIVER")" || continue
+            DRIVERS+=("$DRIVER")
+          done
+          if [ ${#DRIVERS[@]} -eq 0 ]; then
+            echo "🧭 没有需要构建的 driver-agent"
+            exit 0
+          fi
+          NORMALIZED_CHANGED_DRIVER_AGENTS="$(IFS=,; echo "${DRIVERS[*]}")"
+          echo "🧭 归一后的 driver-agent 构建列表：${NORMALIZED_CHANGED_DRIVER_AGENTS}"
          OUTDIR="drivers/${{ matrix.os_name }}"
          mkdir -p "$OUTDIR"
          DUCKDB_WINDOWS_LIBRARY_VERSION="v1.4.4"
@@ -644,10 +682,7 @@ jobs:
          }

          for DRIVER in "${DRIVERS[@]}"; do
-            BUILD_DRIVER="$DRIVER"
-            if [ "$DRIVER" = "doris" ]; then
-              BUILD_DRIVER="diros"
-            fi
+            BUILD_DRIVER="$(build_driver_name "$DRIVER")"
            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" != "amd64" ]; then
              echo "⚠️ 跳过 DuckDB driver（当前平台 ${GOOS}/${GOARCH} 不受支持，仅支持 windows/amd64）"
              continue
@@ -742,7 +777,7 @@ jobs:
          bash ./tools/verify-driver-agent-revisions.sh \
            --assets-dir drivers \
            --platform "$TARGET_PLATFORM" \
-            --drivers "$CHANGED_DRIVER_AGENTS"
+            --drivers "$NORMALIZED_CHANGED_DRIVER_AGENTS"

      # macOS Packaging
      - name: Package macOS DMG
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -535,7 +535,45 @@ jobs:
          export GOCACHE="${RUNNER_TEMP}/go-build-${{ matrix.os_name }}-${{ matrix.arch_name }}-${REVISION_HASH}"
          mkdir -p "$GOCACHE"
          echo "🧭 可选驱动使用隔离 GOCACHE：$GOCACHE"
-          IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          normalize_driver_token() {
+            local value
+            value="$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+            case "$value" in
+              "") return 1 ;;
+              doris|diros) echo "doris" ;;
+              open_gauss|open-gauss) echo "opengauss" ;;
+              gaussdb|gauss_db|gauss-db) echo "gaussdb" ;;
+              elastic|elasticsearch) echo "elasticsearch" ;;
+              mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|opengauss|gaussdb|iris|mongodb|tdengine|iotdb|clickhouse)
+                echo "$value"
+                ;;
+              *)
+                echo "❌ 不支持的 driver-agent：${1:-}" >&2
+                return 1
+                ;;
+            esac
+          }
+
+          build_driver_name() {
+            case "$1" in
+              doris) echo "diros" ;;
+              *) echo "$1" ;;
+            esac
+          }
+
+          declare -a RAW_DRIVERS=()
+          declare -a DRIVERS=()
+          IFS=',' read -r -a RAW_DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          for RAW_DRIVER in "${RAW_DRIVERS[@]}"; do
+            DRIVER="$(normalize_driver_token "$RAW_DRIVER")" || continue
+            DRIVERS+=("$DRIVER")
+          done
+          if [ ${#DRIVERS[@]} -eq 0 ]; then
+            echo "🧭 没有需要构建的 driver-agent"
+            exit 0
+          fi
+          NORMALIZED_CHANGED_DRIVER_AGENTS="$(IFS=,; echo "${DRIVERS[*]}")"
+          echo "🧭 归一后的 driver-agent 构建列表：${NORMALIZED_CHANGED_DRIVER_AGENTS}"
          OUTDIR="drivers/${{ matrix.os_name }}"
          mkdir -p "$OUTDIR"
          DUCKDB_WINDOWS_LIBRARY_VERSION="v1.4.4"
@@ -591,10 +629,7 @@ jobs:
          }

          for DRIVER in "${DRIVERS[@]}"; do
-            BUILD_DRIVER="$DRIVER"
-            if [ "$DRIVER" = "doris" ]; then
-              BUILD_DRIVER="diros"
-            fi
+            BUILD_DRIVER="$(build_driver_name "$DRIVER")"
            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" != "amd64" ]; then
              echo "⚠️ 跳过 DuckDB driver（当前平台 ${GOOS}/${GOARCH} 不受支持，仅支持 windows/amd64）"
              continue
@@ -689,7 +724,7 @@ jobs:
          bash ./tools/verify-driver-agent-revisions.sh \
            --assets-dir drivers \
            --platform "$TARGET_PLATFORM" \
-            --drivers "$CHANGED_DRIVER_AGENTS"
+            --drivers "$NORMALIZED_CHANGED_DRIVER_AGENTS"

      # macOS Packaging
      - name: Package macOS DMG
--- a/tools/verify-driver-agent-revisions.sh
+++ b/tools/verify-driver-agent-revisions.sh
@@ -140,17 +140,43 @@ agent_variants_for() {

 probe_agent_revision() {
  local agent_path="$1"
+  local stdout_file stderr_file probe_exit
  local request
  request='{"id":1,"method":"metadata"}'
-  printf '%s\n' "$request" | "$agent_path" | python3 -c '
+  stdout_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-agent-revision-stdout.XXXXXX")"
+  stderr_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-agent-revision-stderr.XXXXXX")"
+
+  if ! printf '%s\n' "$request" | "$agent_path" >"$stdout_file" 2>"$stderr_file"; then
+    [[ -s "$stderr_file" ]] && sed "s/^/   stderr: /" "$stderr_file" >&2
+    rm -f "$stdout_file" "$stderr_file"
+    return 1
+  fi
+
+  python3 - "$stdout_file" <<'PY'
 import json
 import sys
+from pathlib import Path

-line = sys.stdin.readline()
-payload = json.loads(line)
+lines = [
+    line.strip()
+    for line in Path(sys.argv[1]).read_text(encoding="utf-8", errors="replace").splitlines()
+    if line.strip()
+]
+if not lines:
+    raise SystemExit(1)
+try:
+    payload = json.loads(lines[0])
+except json.JSONDecodeError:
+    raise SystemExit(1)
 data = payload.get("data") or {}
 print(data.get("agentRevision", ""))
-'
+PY
+  probe_exit=$?
+  if [[ "$probe_exit" -ne 0 && -s "$stderr_file" ]]; then
+    sed "s/^/   stderr: /" "$stderr_file" >&2
+  fi
+  rm -f "$stdout_file" "$stderr_file"
+  return "$probe_exit"
 }

 probe_host_agent_revision() {