Update tor to 0.4.7.7, and focus on just build-win64

This commit is contained in:
Micah Lee 2022-05-25 21:46:12 -07:00
parent 053688c4b9
commit ad6e7f05be
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -8,19 +8,19 @@ workflows:
test_and_build: test_and_build:
jobs: jobs:
- test-cli - test-cli
- test-gui # - test-gui
- build-win64: - build-win64:
requires: requires:
- test-cli - test-cli
# - test-gui # - test-gui
- build-win32: # - build-win32:
requires: # requires:
- test-cli # - test-cli
# - test-gui # # - test-gui
- build-macos: # - build-macos:
requires: # requires:
- test-cli # - test-cli
# - test-gui # # - test-gui
jobs: jobs:
test-cli: test-cli:
@ -101,22 +101,22 @@ jobs:
cd ~\project\desktop cd ~\project\desktop
poetry install poetry install
- restore_cache: - restore_cache:
key: download-tor-win32-0.4.6.10 key: download-tor-win32-0.4.7.7
- run: - run:
name: Download tor (Windows Expert Bundle) name: Download tor (Windows Expert Bundle)
command: | command: |
mkdir ~\Downloads\tor mkdir ~\Downloads\tor
cd ~\Downloads\tor cd ~\Downloads\tor
$URL = "https://www.torproject.org/dist/torbrowser/11.0.10/tor-win32-0.4.6.10.zip" $URL = "https://www.torproject.org/dist/torbrowser/11.0.13/tor-win32-0.4.7.7.zip"
$Filename = "tor-win32-0.4.6.10.zip" $Filename = "tor-win32-0.4.7.7.zip"
$ExpectedHash = "d3f62317507dbe1a1aa74b9e0e03996dbded2143f94409270828f6a8bcdda16a" $ExpectedHash = "6af0088460d61a5e60971aea94562a3bed2fb597da6b8ac77948a5f6424dfa29"
Invoke-WebRequest -Uri $URL -OutFile $Filename Invoke-WebRequest -Uri $URL -OutFile $Filename
$FileHash = Get-FileHash $Filename $FileHash = Get-FileHash $Filename
if($FileHash.Hash -ne $ExpectedHash) { throw "Invalid hash" } if($FileHash.Hash -ne $ExpectedHash) { throw "Invalid hash" }
mkdir ~\Downloads\tor\tor-win32 mkdir ~\Downloads\tor\tor-win32
Expand-Archive -LiteralPath tor-win32-0.4.6.10.zip -DestinationPath ~\Downloads\tor\tor-win32 Expand-Archive -LiteralPath tor-win32-0.4.7.7.zip -DestinationPath ~\Downloads\tor\tor-win32
- save_cache: - save_cache:
key: download-tor-win32-0.4.6.10 key: download-tor-win32-0.4.7.7
paths: paths:
- ~\Downloads\tor\tor-win32 - ~\Downloads\tor\tor-win32
- run: - run:
@ -199,22 +199,22 @@ jobs:
cd ~\project\desktop cd ~\project\desktop
C:\Python-32bit\Scripts\poetry install C:\Python-32bit\Scripts\poetry install
- restore_cache: - restore_cache:
key: download-tor-win32-0.4.6.10 key: download-tor-win32-0.4.7.7
- run: - run:
name: Download tor (Windows Expert Bundle) name: Download tor (Windows Expert Bundle)
command: | command: |
mkdir ~\Downloads\tor mkdir ~\Downloads\tor
cd ~\Downloads\tor cd ~\Downloads\tor
$URL = "https://www.torproject.org/dist/torbrowser/11.0.10/tor-win32-0.4.6.10.zip" $URL = "https://www.torproject.org/dist/torbrowser/11.0.13/tor-win32-0.4.7.7.zip"
$Filename = "tor-win32-0.4.6.10.zip" $Filename = "tor-win32-0.4.7.7.zip"
$ExpectedHash = "d3f62317507dbe1a1aa74b9e0e03996dbded2143f94409270828f6a8bcdda16a" $ExpectedHash = "6af0088460d61a5e60971aea94562a3bed2fb597da6b8ac77948a5f6424dfa29"
Invoke-WebRequest -Uri $URL -OutFile $Filename Invoke-WebRequest -Uri $URL -OutFile $Filename
$FileHash = Get-FileHash $Filename $FileHash = Get-FileHash $Filename
if($FileHash.Hash -ne $ExpectedHash) { throw "Invalid hash" } if($FileHash.Hash -ne $ExpectedHash) { throw "Invalid hash" }
mkdir ~\Downloads\tor\tor-win32 mkdir ~\Downloads\tor\tor-win32
Expand-Archive -LiteralPath tor-win32-0.4.6.10.zip -DestinationPath ~\Downloads\tor\tor-win32 Expand-Archive -LiteralPath tor-win32-0.4.7.7.zip -DestinationPath ~\Downloads\tor\tor-win32
- save_cache: - save_cache:
key: download-tor-win32-0.4.6.10 key: download-tor-win32-0.4.7.7
paths: paths:
- ~\Downloads\tor\tor-win32 - ~\Downloads\tor\tor-win32
- run: - run: