Skip to content

Commit

Permalink
to: fix config && add windows test
Browse files Browse the repository at this point in the history
  • Loading branch information
fishros committed Apr 2, 2024
1 parent db01e34 commit 55d04f2
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,33 @@ jobs:
- name: Build with PyInstaller
run: pyinstaller release_linux.spec


build-linux-windows:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Python 3.10.10
uses: actions/setup-python@master
with:
python-version: 3.10.10

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pyinstaller
pip install pyserial requests PyQt6
- name: Build with PyInstaller
run: pyinstaller release_win.spec



release:
runs-on: ubuntu-22.04
needs: build-linux-amd64
steps:
- name: Generate file list for bin directory
id: file_list
run: |
Expand Down
2 changes: 1 addition & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def click_config_button(self):
if value == self.current_configs[key]:
self.put_log(f"[警告]配置值和当前设备值相同")

result = config_board(
result = self.esp_tool.config_board(
key, value, port=port, baudrate=115200)


Expand Down
2 changes: 1 addition & 1 deletion release_win.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ a = Analysis(
['main.py'],
pathex=['/home/fishros/github/fishbot_tool/'],
binaries=[],
datas=[('ui\\about.ui', 'ui'),('ui\\main.ui', 'ui'),('ui\\taobao.ui', 'ui'),('ui\\assert\\fishros.jpg', 'ui\\assert'),('ui\\assert\\taobao.jpeg', 'ui\\assert'),],
datas=[('esptool\\esptool_win64.exe', '.'),('ui\\about.ui', 'ui'),('ui\\main.ui', 'ui'),('ui\\taobao.ui', 'ui'),('ui\\assert\\fishros.jpg', 'ui\\assert'),('ui\\assert\\taobao.jpeg', 'ui\\assert'),],
hiddenimports=[],
hookspath=[],
hooksconfig={},
Expand Down

0 comments on commit 55d04f2

Please sign in to comment.