From db38531425f4672cad78386288fa2669ccfb3568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn> Date: Mon, 11 Aug 2025 14:36:09 +0800 Subject: [PATCH] Update assets.yml --- .github/workflows/assets.yml | 52 +++++++++++------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml index bdbad9e52..2c9a1f032 100644 --- a/.github/workflows/assets.yml +++ b/.github/workflows/assets.yml @@ -35,45 +35,29 @@ jobs: echo "Files copied to temp directory (before processing):" ls -la temp-b-repo/out/assets - # 安装lxml库 - pip install lxml - - # 生成Python脚本（修复XML头和注释删除问题） - echo "from lxml import etree" > remove_xml_comments.py + # 生成Python脚本（逐行写入避免语法问题） + echo "import xml.etree.ElementTree as ET" > remove_xml_comments.py echo "import os" >> remove_xml_comments.py echo "" >> remove_xml_comments.py echo "def remove_comments_from_xml(file_path):" >> remove_xml_comments.py echo " try:" >> remove_xml_comments.py - echo " # 解析XML并保留原始声明和注释" >> remove_xml_comments.py - echo " parser = etree.XMLParser(remove_comments=False, strip_cdata=False)" >> remove_xml_comments.py - echo " tree = etree.parse(file_path, parser=parser)" >> remove_xml_comments.py + echo " # 解析XML并保留注释" >> remove_xml_comments.py + echo " parser = ET.XMLParser(target=ET.TreeBuilder(insert_comments=True))" >> remove_xml_comments.py + echo " tree = ET.parse(file_path, parser=parser)" >> remove_xml_comments.py echo " root = tree.getroot()" >> remove_xml_comments.py echo "" >> remove_xml_comments.py - echo " # 关键修复：删除所有层级的注释（包括非root区域）" >> remove_xml_comments.py - echo " # 遍历所有节点，强制检查注释类型" >> remove_xml_comments.py - echo " for element in root.iter():" >> remove_xml_comments.py - echo " # 遍历子节点的副本，避免修改时索引错乱" >> remove_xml_comments.py + echo " # 递归删除注释节点" >> remove_xml_comments.py + echo " def remove_comments(element):" >> remove_xml_comments.py echo " for child in list(element):" >> remove_xml_comments.py - echo " if child.tag is etree.Comment:" >> remove_xml_comments.py + echo " if child.tag is ET.Comment:" >> remove_xml_comments.py echo " element.remove(child)" >> remove_xml_comments.py + echo " else:" >> remove_xml_comments.py + echo " remove_comments(child)" >> remove_xml_comments.py echo "" >> remove_xml_comments.py - echo " # 保存修改后的文件（修复XML头缺失问题）" >> remove_xml_comments.py - echo " # 获取原始XML声明（如果存在）" >> remove_xml_comments.py - echo " xml_declaration = tree.docinfo.xml_declaration" >> remove_xml_comments.py - echo " encoding = tree.docinfo.encoding or 'utf-8'" >> remove_xml_comments.py + echo " remove_comments(root)" >> remove_xml_comments.py echo "" >> remove_xml_comments.py - echo " # 写入文件时强制保留XML声明" >> remove_xml_comments.py - echo " with open(file_path, 'wb') as f:" >> remove_xml_comments.py - echo " # 手动写入XML声明（确保不缺失）" >> remove_xml_comments.py - echo " if xml_declaration or xml_declaration is None:" >> remove_xml_comments.py - echo " f.write(f'\n'.encode(encoding))" >> remove_xml_comments.py - echo " # 写入XML内容，控制自闭合标签格式" >> remove_xml_comments.py - echo " tree.write(f," >> remove_xml_comments.py - echo " encoding=encoding," >> remove_xml_comments.py - echo " pretty_print=False," >> remove_xml_comments.py - echo " method='xml'," >> remove_xml_comments.py - echo " xml_declaration=False # 已手动处理声明，避免重复" >> remove_xml_comments.py - echo " )" >> remove_xml_comments.py + echo " # 保存修改后的文件" >> remove_xml_comments.py + echo " tree.write(file_path, encoding='utf-8', xml_declaration=True)" >> remove_xml_comments.py echo " print(f'Processed: {file_path}')" >> remove_xml_comments.py echo " except Exception as e:" >> remove_xml_comments.py echo " print(f'Error processing {file_path}: {e}')" >> remove_xml_comments.py @@ -85,7 +69,7 @@ jobs: echo " file_path = os.path.join(root_dir, file)" >> remove_xml_comments.py echo " remove_comments_from_xml(file_path)" >> remove_xml_comments.py - # 运行Python脚本处理XML + # 运行Python脚本 python remove_xml_comments.py echo "Files in temp directory after comment removal:" @@ -94,7 +78,7 @@ jobs: - name: Push to Private B Repo env: B_REPO_TOKEN: ${{ secrets.B_REPO_TOKEN }} - B_REPO_URL: https://github.com/TO-teams/flash.git + B_REPO_URL: https://github.com/TO-teams/flash.git # 已修正为github.com B_BRANCH: main run: | git config --global user.name "GitHub Actions" @@ -112,12 +96,6 @@ jobs: echo "Files in B repo target directory after copy:" ls -la out/assets - # 检查是否有实际变更 - if git diff --quiet -- out/assets; then - echo "No changes to sync. Exiting." - exit 0 - fi - git add out/assets git commit -m "Sync assets (no comments): $(date +'%Y-%m-%d %H:%M:%S')" git push origin $B_BRANCH || { echo "Failed to push to B repo"; exit 1; }