Skip to content

Commit

Permalink
fix:user specific configuration update failure
Browse files Browse the repository at this point in the history
  • Loading branch information
Guovin committed Mar 29, 2024
1 parent f515706 commit 7e4480c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 20 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Set final file name
id: set_final_file_name
run: |
echo "::set-output name=final_file::$(python -c '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: Install pipenv
run: pip3 install --user pipenv
Expand All @@ -57,7 +57,9 @@ jobs:
if [[ -f ${{ steps.set_final_file_name.outputs.final_file }} ]]; then
git add ${{ steps.set_final_file_name.outputs.final_file }}
fi
if [[ -f result.log ]]; then
if [[ -f user_result.log ]]; then
git add user_result.log
elif [[ -f result.log ]]; then
git add result.log
fi
if ! git diff --staged --quiet; then
Expand Down
24 changes: 8 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## v1.0.0

### 2024/3/29

- 修复用户专属配置更新结果失败

---

- Fixed user specific configuration update failure

### 2024/3/26

- 新增快速上手-详细教程
Expand Down Expand Up @@ -95,19 +103,3 @@
- Removed configuration items: whether to filter invalid interfaces, always perform filtering
- Removed sorting by date, using response time and resolution as sorting rules
- Updated README: added modification update frequency, file proxy description, update log

## v1.0.1

### 2024/3/27

- test

---

-test

### 2024/3/28

#### -test

-test
2 changes: 1 addition & 1 deletion main.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
try:
import user_config as config
except ImportError:
import config as config
import config
import aiohttp
import asyncio
import time
Expand Down

0 comments on commit 7e4480c

Please sign in to comment.