From bde1a35d03acd9542158fe1f0b62bdf76654fe36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E4=BA=91?= Date: Fri, 16 May 2025 19:18:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E5=9C=A8=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=8A=E6=B8=B8=E4=BB=93=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/jsonDataValidation.yml | 45 +++++++----------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/.github/workflows/jsonDataValidation.yml b/.github/workflows/jsonDataValidation.yml index 7ee9c26b..7e382f90 100644 --- a/.github/workflows/jsonDataValidation.yml +++ b/.github/workflows/jsonDataValidation.yml @@ -160,41 +160,22 @@ jobs: - name: Prepare validation script run: | - # 尝试从upstream/main获取validate.py - echo "尝试从上游仓库获取validate.py文件" - git show upstream/main:build/validate.py > build/validate.py.tmp 2>/dev/null - - # 检查文件是否成功获取并且非空 - if [ ! -s "build/validate.py.tmp" ]; then - echo "无法从上游仓库获取validate.py文件,终止流程" - exit 1 + # 检查build目录和validate.py文件是否存在 + mkdir -p build + if [ ! -f "build/validate.py" ]; then + echo "build/validate.py不存在,跳过获取步骤" else - echo "成功获取validate.py" - - # 添加编码声明到文件开头 - echo '#!/usr/bin/env python3' > build/validate.py - echo '# -*- coding: utf-8 -*-' >> build/validate.py - - # 添加原始文件内容 - cat build/validate.py.tmp >> build/validate.py - rm build/validate.py.tmp - - # 替换origin/main为upstream/main - sed -i 's/origin\/main/upstream\/main/g' build/validate.py - # 替换git来源标识 - sed -i 's/"git"/"upstream"/g' build/validate.py - # 修改提示信息 - sed -i 's/本地文件/PR提交的文件/g' build/validate.py - - # 检查文件编码 - echo "检查文件编码:" - file build/validate.py - - # 显示文件开头部分确认编码声明已添加 - echo "验证脚本开头内容:" - head -n 5 build/validate.py + echo "build/validate.py已存在,检查文件头部" + head -n 10 build/validate.py fi + # 检查文件执行权限 + chmod +x build/validate.py + + # 检查文件编码 + echo "检查文件编码:" + file build/validate.py + - name: Get PR information for workflow_dispatch if: ${{ steps.set_env.outputs.trigger_type == 'manual' && steps.set_env.outputs.pr_number != '' }} id: pr_info