From cbd67cabef735ed0a6e3a75264c3dc763bd80582 Mon Sep 17 00:00:00 2001 From: "guorong.zheng" <360996299@qq.com> Date: Sat, 30 Mar 2024 19:18:26 +0800 Subject: [PATCH] fix: import config and diff to add --- .github/workflows/main.yml | 9 ++++++--- CHANGELOG.md | 10 +++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c885272ef8..72b0ae0058e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,8 +46,12 @@ jobs: - name: Set final file name id: set_final_file_name run: | - python -c 'try: import user_config as config; except ImportError: import config; print(config.final_file)' - echo "::set-output name=final_file::$(python -c 'try: import user_config as config; except ImportError: import config; print(config.final_file)')" + echo "::set-output name=final_file::$(python -c ' + try: + import user_config as config + except ImportError: + import config + print(config.final_file)')" - name: Commit and push if changed run: | git config --local user.email "github-actions[bot]@users.noreply.github.com" @@ -56,7 +60,6 @@ jobs: final_file="${{ steps.set_final_file_name.outputs.final_file }}" if [[ -f "$final_file" ]]; then git add "$final_file" - echo "File added" fi if [[ -f user_result.log ]]; then git add user_result.log diff --git a/CHANGELOG.md b/CHANGELOG.md index 71e7ae44b8d..7ca3815ca7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,21 @@ ## v1.0.0 +### 2024/3/30 + +- 修复工作流读取配置与更新文件对比问题 + +--- + +- Fix the issue of workflow reading configuration and comparing updated files + ### 2024/3/29 - 修复用户专属配置更新结果失败 --- -- Fixed user specific configuration update failure +- Fix user specific configuration update failure ### 2024/3/26