Skip to content

Commit

Permalink
fix: remove ui server from building process
Browse files Browse the repository at this point in the history
  • Loading branch information
builder555 committed Jan 25, 2024
1 parent 005c383 commit f45b16e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
node-version: 18
- name: Install dependencies for ${{matrix.target}}
run: |
pip install pyinstaller websockets requests pinecil
pip install pyinstaller websockets requests pinecil typing_extensions
pushd ui && npm install && popd
- name: Build application for ${{matrix.target}}
run: ${{ matrix.BUILD_CMD }}
Expand Down
3 changes: 2 additions & 1 deletion backend/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ name = "pypi"
websockets = "*"
requests = "*"
pinecil = "*"
black = "*"
typing_extensions = "*"

[dev-packages]
black = "*"
pytest = "*"
pytest-watch = "*"
pytest-asyncio = "*"
Expand Down
2 changes: 1 addition & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ pushd ui || exit 2
npm run build
popd || exit 2

pyinstaller --onefile --name Pinecil --add-data "./version.txt:./" --add-data "./ui/dist:./gui" backend/main.py --collect-submodules dbus_fast
pyinstaller --onefile --name Pinecil --add-data "./version.txt:./" --add-data "./ui/dist:./gui" backend/main.py --hidden-import=typing_extensions --collect-submodules dbus_fast
11 changes: 3 additions & 8 deletions ci/start.ps1
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
$process1 = Start-Process .\main_server\main_server.exe -PassThru
$process1 = Start-Process .\Pinecil.exe -PassThru

$pid1 = $process1.Id

$process2 = Start-Process .\serve\serve.exe -PassThru

$pid2 = $process2.Id

Write-Output "main_server process ID: $pid1"
Write-Output "server.exe process ID: $pid2"
Write-Output "Pinecil process ID: $pid1"

Start-Sleep -Seconds 5
Start-Process "http://localhost:8080/"

Get-Process -Id $pid1, $pid2 | Wait-Process
Get-Process -Id $pid1 | Wait-Process

0 comments on commit f45b16e

Please sign in to comment.