Install missing module inside the poetry env, and skip compressing step because GitHub Actions does that for you

This commit is contained in:
Micah Lee 2022-09-30 19:40:37 -07:00
parent 9f50e67833
commit d37316b589
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -93,17 +93,11 @@ jobs:
cd desktop cd desktop
C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry run python .\setup-freeze.py build C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry run python .\setup-freeze.py build
C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry run python .\scripts\build-windows.py cleanup-build C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry run python .\scripts\build-windows.py cleanup-build
- name: Compress
shell: pwsh
run: |
mv desktop\build\exe.win-amd64-3.9\ ~\onionshare-win64
Compress-Archive -LiteralPath ~\onionshare-win64 -DestinationPath ~\onionshare-win64.zip
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: win64-build name: win64-build
path: ~\onionshare-win64.zip path: desktop\build\exe.win-amd64-3.9
build-win32: build-win32:
runs-on: windows-latest runs-on: windows-latest
@ -197,17 +191,11 @@ jobs:
cd desktop cd desktop
C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry run python .\setup-freeze.py build C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry run python .\setup-freeze.py build
C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry run python .\scripts\build-windows.py cleanup-build C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry run python .\scripts\build-windows.py cleanup-build
- name: Compress
shell: pwsh
run: |
mv desktop\build\exe.win32-3.9\ ~\onionshare-win32
Compress-Archive -LiteralPath ~\onionshare-win32 -DestinationPath ~\onionshare-win32.zip
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: win32-build name: win32-build
path: ~\onionshare-win32.zip path: desktop\build\exe.win32-3.9
build-mac: build-mac:
runs-on: macos-latest runs-on: macos-latest
@ -283,17 +271,12 @@ jobs:
- name: Build OnionShare - name: Build OnionShare
run: | run: |
cd desktop cd desktop
python3 -m pip install importlib-metadata poetry run pip install importlib-metadata
poetry run python ./setup-freeze.py build poetry run python ./setup-freeze.py build
poetry run python ./setup-freeze.py bdist_mac poetry run python ./setup-freeze.py bdist_mac
poetry run python ./scripts/build-macos.py cleanup-build poetry run python ./scripts/build-macos.py cleanup-build
- name: Compress
run: |
cd ~/project/desktop/build
tar -czvf ~/onionshare-macos.tar.gz OnionShare.app
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: mac-build name: mac-build
path: ~/onionshare-macos.tar.gz path: OnionShare.app