Don't install 7zip with choco because it's already in the CircleCI windows orb, and zip contents of build folder instead of build folder itself

This commit is contained in:
Micah Lee 2022-03-31 18:40:36 -07:00
parent 4297a5a6dc
commit f9b79d667f
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -79,10 +79,9 @@ jobs:
steps: steps:
- checkout - checkout
- run: - run:
name: Install chocolately dependencies name: Install Python 3.9.12
command: | command: |
choco install python --version=3.9.12 choco install python --version=3.9.12
choco install 7zip
- run: - run:
name: Install poetry name: Install poetry
command: (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python - command: (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
@ -109,7 +108,7 @@ jobs:
poetry run python .\package\windows.py cleanup-build poetry run python .\package\windows.py cleanup-build
- run: - run:
name: Compress name: Compress
command: Compress-Archive -LiteralPath ~\project\desktop\build\exe.win-amd64-3.9 -DestinationPath ~\onionshare-win64.zip command: Compress-Archive -LiteralPath ~\project\desktop\build\exe.win-amd64-3.9\* -DestinationPath ~\onionshare-win64.zip
- store_artifacts: - store_artifacts:
path: ~\onionshare-win64.zip path: ~\onionshare-win64.zip
@ -121,10 +120,9 @@ jobs:
steps: steps:
- checkout - checkout
- run: - run:
name: Install chocolately dependencies name: Install Python 3.9.12 (32-bit)
command: | command: |
choco install python3 --params "/InstallDir32:C:\Python-32bit" --version=3.9.12 choco install python3 --params "/InstallDir32:C:\Python-32bit" --version=3.9.12
choco install 7zip
- run: - run:
name: Install golang (32-bit) name: Install golang (32-bit)
command: | command: |
@ -157,6 +155,6 @@ jobs:
C:\Python-32bit\Scripts\poetry run python .\package\windows.py cleanup-build C:\Python-32bit\Scripts\poetry run python .\package\windows.py cleanup-build
- run: - run:
name: Compress name: Compress
command: Compress-Archive -LiteralPath ~\project\desktop\build\exe.win32-3.9 -DestinationPath ~\onionshare-win32.zip command: Compress-Archive -LiteralPath ~\project\desktop\build\exe.win32-3.9\* -DestinationPath ~\onionshare-win32.zip
- store_artifacts: - store_artifacts:
path: ~\onionshare-win32.zip path: ~\onionshare-win32.zip