diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e03ca019480..eacaffb8530 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,12 +37,6 @@ jobs: export DISPLAY=:99 chromedriver --url-base=/wd/hub & sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - - - name: Set final file name - id: set_final_file_name - run: | - echo "::set-output name=final_file::$(python -c 'try: import user_config as config; except ImportError: import config as config; print(config.final_file)')" - - name: Install pipenv run: pip3 install --user pipenv - name: Install dependecies @@ -54,9 +48,14 @@ jobs: git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" git diff - file="${{ steps.set_final_file_name.outputs.final_file }}" - if [[ -f "$file" ]]; then - git add ${{ steps.set_final_file_name.outputs.final_file }} + final_file=$(python -c ' + try: + import user_config as config + except ImportError: + import config + print(config.final_file)') + if [[ -f "$final_file" ]]; then + git add "$final_file" 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 diff --git a/main.py b/main.py index 33148a295db..3687e06d04d 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,7 @@ try: import user_config as config except ImportError: - import config as config + import config from selenium import webdriver from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait diff --git a/utils.py b/utils.py index 66b2412d082..780b0fbf642 100644 --- a/utils.py +++ b/utils.py @@ -1,7 +1,7 @@ try: import user_config as config except ImportError: - import config as config + import config import aiohttp import asyncio import time