aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-03-30 16:09:31 -0700
committerMicah Lee <micah@micahflee.com>2022-03-30 16:09:31 -0700
commitaff969ee09948530b5ae36a336102abfd01d46db (patch)
treef89b933a1803b3fd5698636901d08f4c27a65c74
parente77cd6939e02f602bc60a3b5d4e62bc6f6d073d7 (diff)
downloadonionshare-aff969ee09948530b5ae36a336102abfd01d46db.tar.gz
onionshare-aff969ee09948530b5ae36a336102abfd01d46db.zip
Run setup-freeze.py directly instead of using build-windows.py, and fix go path in build meek script
-rw-r--r--.circleci/config.yml2
-rwxr-xr-xdesktop/scripts/build-meek-client.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6114200..b92236e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -152,7 +152,7 @@ jobs:
name: Build
command: |
cd ~\project\desktop
- C:\Python-32bit\Scripts\poetry run python .\package\build-windows.py --ci-build
+ C:\Python-32bit\Scripts\poetry run python .\setup-freeze.py build
- run:
name: Compress
command: Compress-Archive -LiteralPath ~\project\desktop\build\exe.win32-3.9 -DestinationPath ~\onionshare-win32.zip
diff --git a/desktop/scripts/build-meek-client.py b/desktop/scripts/build-meek-client.py
index a33e314b..6e5d7974 100755
--- a/desktop/scripts/build-meek-client.py
+++ b/desktop/scripts/build-meek-client.py
@@ -50,7 +50,7 @@ def main():
subprocess.run(
[
- "go",
+ go_path,
"install",
"git.torproject.org/pluggable-transports/meek.git/meek-client@v0.37.0",
]