mirror of
https://github.com/onionshare/onionshare.git
synced 2025-01-25 22:15:57 -05:00
Comment everything out outside of building libevent
This commit is contained in:
Micah Lee
parent
ad6e7f05be
commit
bfd7e970e0
@ -5,7 +5,7 @@ orbs:
|
|||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
test_and_build:
|
ci:
|
||||||
jobs:
|
jobs:
|
||||||
- test-cli
|
- test-cli
|
||||||
# - test-gui
|
# - test-gui
|
||||||
@ -88,91 +88,175 @@ jobs:
|
|||||||
shell: powershell.exe
|
shell: powershell.exe
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
|
# # Install python
|
||||||
|
# - run:
|
||||||
|
# name: Install Python 3.9.12
|
||||||
|
# command: |
|
||||||
|
# choco install python3 --version=3.9.12
|
||||||
|
|
||||||
|
# # Install poetry
|
||||||
|
# - run:
|
||||||
|
# name: Install poetry
|
||||||
|
# command: (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
|
||||||
|
|
||||||
|
# # Install poetry dependencies
|
||||||
|
# - restore_cache:
|
||||||
|
# key: build-win64-desktop-poetry-deps-{{ checksum "C:\Users\circleci\project\desktop\poetry.lock" }}
|
||||||
|
# - run:
|
||||||
|
# name: Install poetry dependencies
|
||||||
|
# command: |
|
||||||
|
# cd C:\Users\circleci\project\desktop
|
||||||
|
# poetry install
|
||||||
|
# - save_cache:
|
||||||
|
# key: build-win64-desktop-poetry-deps-{{ checksum "C:\Users\circleci\project\desktop\poetry.lock" }}
|
||||||
|
# paths:
|
||||||
|
# - C:\Users\circleci\AppData\Local\pypoetry\Cache\virtualenvs
|
||||||
|
|
||||||
- run:
|
- run:
|
||||||
name: Install Python 3.9.12
|
name: Install msys2 and dependencies
|
||||||
command: |
|
command: |
|
||||||
choco install python3 --version=3.9.12
|
choco install msys2 --params "/NoUpdate /InstallDir:C:\msys2"
|
||||||
|
refreshenv
|
||||||
|
C:\msys2\usr\bin\bash -c "/c/msys2/usr/bin/pacman -S --needed --noconfirm autoconf automake libtool make clang"
|
||||||
|
mkdir C:\Users\circleci\src
|
||||||
|
|
||||||
|
# Build libevent
|
||||||
- run:
|
- run:
|
||||||
name: Install poetry
|
name: Build libevent
|
||||||
command: (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
|
|
||||||
- run:
|
|
||||||
name: Install poetry dependencies
|
|
||||||
command: |
|
command: |
|
||||||
cd ~\project\desktop
|
$LibeventTag = "release-2.1.12-stable"
|
||||||
poetry install
|
|
||||||
- restore_cache:
|
# Get source
|
||||||
key: download-tor-win32-0.4.7.7
|
gpg --recv-key 9E3AC83A27974B84D1B3401DB86086848EF8686D
|
||||||
- run:
|
cd C:\Users\circleci\src
|
||||||
name: Download tor (Windows Expert Bundle)
|
git clone https://github.com/libevent/libevent.git
|
||||||
command: |
|
cd libevent
|
||||||
mkdir ~\Downloads\tor
|
git tag -v $LibeventTag
|
||||||
cd ~\Downloads\tor
|
if($? -ne $true) { throw "libevent tag doesn't verify" }
|
||||||
$URL = "https://www.torproject.org/dist/torbrowser/11.0.13/tor-win32-0.4.7.7.zip"
|
git checkout $LibeventTag
|
||||||
$Filename = "tor-win32-0.4.7.7.zip"
|
|
||||||
$ExpectedHash = "6af0088460d61a5e60971aea94562a3bed2fb597da6b8ac77948a5f6424dfa29"
|
# Build
|
||||||
Invoke-WebRequest -Uri $URL -OutFile $Filename
|
$BashScript = @"
|
||||||
$FileHash = Get-FileHash $Filename
|
#!/bin/bash
|
||||||
if($FileHash.Hash -ne $ExpectedHash) { throw "Invalid hash" }
|
export PATH=/c/msys2/usr/bin:$PATH
|
||||||
mkdir ~\Downloads\tor\tor-win32
|
cd /c/Users/circleci/src/libevent
|
||||||
Expand-Archive -LiteralPath tor-win32-0.4.7.7.zip -DestinationPath ~\Downloads\tor\tor-win32
|
./autogen.sh
|
||||||
- save_cache:
|
./configure --prefix=/opt/libevent-build --with-pic
|
||||||
key: download-tor-win32-0.4.7.7
|
make -j8 install
|
||||||
paths:
|
"@
|
||||||
- ~\Downloads\tor\tor-win32
|
|
||||||
- run:
|
# # Build tor
|
||||||
name: Copy tor binary into app
|
# - run:
|
||||||
command: cp ~\Downloads\tor\tor-win32\* ~\project\desktop\onionshare\resources\tor
|
# name: Build tor
|
||||||
- restore_cache:
|
# command: |
|
||||||
key: build-win64-obfs4proxy-v0.0.13
|
# $LibeventTag = "release-2.1.12-stable"
|
||||||
- run:
|
# $TorTag = "tor-0.4.7.7"
|
||||||
name: Build obfs4proxy
|
|
||||||
command: |
|
# choco install msys2 --params "/NoUpdate /InstallDir:C:\msys2"
|
||||||
mkdir ~\Downloads\obfs4proxy
|
# C:\msys2\usr\bin\bash -c "pacman --sync --noconfirm msys/autoconf"
|
||||||
cd Downloads\obfs4proxy
|
# C:\msys2\usr\bin\bash -c "pacman --sync --noconfirm msys/automake"
|
||||||
git clone https://gitlab.com/yawning/obfs4
|
|
||||||
cd obfs4
|
# # Get libevent source
|
||||||
git checkout obfs4proxy-0.0.13
|
# gpg --recv-key 9E3AC83A27974B84D1B3401DB86086848EF8686D
|
||||||
go build .\obfs4proxy
|
# cd C:\Users\circleci\src
|
||||||
Move-Item -Path .\obfs4proxy.exe -Destination ~\project\desktop\onionshare\resources\tor\Tor\obfs4proxy.exe
|
# git clone https://github.com/libevent/libevent.git
|
||||||
- save_cache:
|
# cd libevent
|
||||||
key: build-win64-obfs4proxy-v0.0.13
|
# git tag -v $LibeventTag
|
||||||
paths:
|
# if($? -ne $true) { throw "libevent tag doesn't verify" }
|
||||||
- ~\project\desktop\onionshare\resources\tor\Tor\obfs4proxy.exe
|
# git checkout $LibeventTag
|
||||||
- restore_cache:
|
|
||||||
key: build-win64-snowflake-v2.1.0
|
# # Build libevent
|
||||||
- run:
|
# $BashScript = @"
|
||||||
name: Build snowflake-client
|
# #!/bin/bash
|
||||||
command: |
|
# export PATH=/c/msys2/usr/bin:$PATH
|
||||||
go install git.torproject.org/pluggable-transports/snowflake.git/client@v2.1.0
|
# cd /c/Users/circleci/src/libevent
|
||||||
Move-Item -Path ~\go\bin\client.exe -Destination ~\project\desktop\onionshare\resources\tor\Tor\snowflake-client.exe
|
# ./autogen.sh
|
||||||
- save_cache:
|
# ./configure --prefix=/opt/libevent-build --with-pic
|
||||||
key: build-win64-snowflake-v2.1.0
|
# make -j8 install
|
||||||
paths:
|
# "@
|
||||||
- ~\project\desktop\onionshare\resources\tor\Tor\snowflake-client.exe
|
|
||||||
- restore_cache:
|
# # Get tor source
|
||||||
key: build-win64-meek-v0.37.0
|
# gpg --recv-key B74417EDDF22AC9F9E90F49142E86A2A11F48D36
|
||||||
- run:
|
# cd C:\Users\circleci\src
|
||||||
name: Build meek-client
|
# git clone https://git.torproject.org/tor.git
|
||||||
command: |
|
# cd tor
|
||||||
go install git.torproject.org/pluggable-transports/meek.git/meek-client@v0.37.0
|
# git tag -v $TorTag
|
||||||
Move-Item -Path ~\go\bin\meek-client.exe -Destination ~\project\desktop\onionshare\resources\tor\Tor\meek-client.exe
|
# if($? -ne $true) { throw "tor tag doesn't verify" }
|
||||||
- save_cache:
|
# git checkout $TorTag
|
||||||
key: build-win64-meek-v0.37.0
|
|
||||||
paths:
|
# - restore_cache:
|
||||||
- ~\project\desktop\onionshare\resources\tor\Tor\meek-client.exe
|
# key: download-tor-win32-0.4.7.7
|
||||||
- run:
|
# - run:
|
||||||
name: Build OnionShare
|
# name: Download tor (Windows Expert Bundle)
|
||||||
command: |
|
# command: |
|
||||||
cd ~\project\desktop
|
# mkdir ~\Downloads\tor
|
||||||
poetry run python .\setup-freeze.py build
|
# cd ~\Downloads\tor
|
||||||
poetry run python .\scripts\build-windows.py cleanup-build
|
# $URL = "https://www.torproject.org/dist/torbrowser/11.0.13/tor-win32-0.4.7.7.zip"
|
||||||
- run:
|
# $Filename = "tor-win32-0.4.7.7.zip"
|
||||||
name: Compress
|
# $ExpectedHash = "6af0088460d61a5e60971aea94562a3bed2fb597da6b8ac77948a5f6424dfa29"
|
||||||
command: |
|
# Invoke-WebRequest -Uri $URL -OutFile $Filename
|
||||||
mv ~\project\desktop\build\exe.win-amd64-3.9\ ~\onionshare-win64
|
# $FileHash = Get-FileHash $Filename
|
||||||
Compress-Archive -LiteralPath ~\onionshare-win64 -DestinationPath ~\onionshare-win64.zip
|
# if($FileHash.Hash -ne $ExpectedHash) { throw "Invalid hash" }
|
||||||
- store_artifacts:
|
# mkdir ~\Downloads\tor\tor-win32
|
||||||
path: ~\onionshare-win64.zip
|
# Expand-Archive -LiteralPath tor-win32-0.4.7.7.zip -DestinationPath ~\Downloads\tor\tor-win32
|
||||||
|
# - save_cache:
|
||||||
|
# key: download-tor-win32-0.4.7.7
|
||||||
|
# paths:
|
||||||
|
# - ~\Downloads\tor\tor-win32
|
||||||
|
# - run:
|
||||||
|
# name: Copy tor binary into app
|
||||||
|
# command: cp ~\Downloads\tor\tor-win32\* ~\project\desktop\onionshare\resources\tor
|
||||||
|
# - restore_cache:
|
||||||
|
# key: build-win64-obfs4proxy-v0.0.13
|
||||||
|
# - run:
|
||||||
|
# name: Build obfs4proxy
|
||||||
|
# command: |
|
||||||
|
# mkdir ~\Downloads\obfs4proxy
|
||||||
|
# cd Downloads\obfs4proxy
|
||||||
|
# git clone https://gitlab.com/yawning/obfs4
|
||||||
|
# cd obfs4
|
||||||
|
# git checkout obfs4proxy-0.0.13
|
||||||
|
# go build .\obfs4proxy
|
||||||
|
# Move-Item -Path .\obfs4proxy.exe -Destination ~\project\desktop\onionshare\resources\tor\Tor\obfs4proxy.exe
|
||||||
|
# - save_cache:
|
||||||
|
# key: build-win64-obfs4proxy-v0.0.13
|
||||||
|
# paths:
|
||||||
|
# - ~\project\desktop\onionshare\resources\tor\Tor\obfs4proxy.exe
|
||||||
|
# - restore_cache:
|
||||||
|
# key: build-win64-snowflake-v2.1.0
|
||||||
|
# - run:
|
||||||
|
# name: Build snowflake-client
|
||||||
|
# command: |
|
||||||
|
# go install git.torproject.org/pluggable-transports/snowflake.git/client@v2.1.0
|
||||||
|
# Move-Item -Path ~\go\bin\client.exe -Destination ~\project\desktop\onionshare\resources\tor\Tor\snowflake-client.exe
|
||||||
|
# - save_cache:
|
||||||
|
# key: build-win64-snowflake-v2.1.0
|
||||||
|
# paths:
|
||||||
|
# - ~\project\desktop\onionshare\resources\tor\Tor\snowflake-client.exe
|
||||||
|
# - restore_cache:
|
||||||
|
# key: build-win64-meek-v0.37.0
|
||||||
|
# - run:
|
||||||
|
# name: Build meek-client
|
||||||
|
# command: |
|
||||||
|
# go install git.torproject.org/pluggable-transports/meek.git/meek-client@v0.37.0
|
||||||
|
# Move-Item -Path ~\go\bin\meek-client.exe -Destination ~\project\desktop\onionshare\resources\tor\Tor\meek-client.exe
|
||||||
|
# - save_cache:
|
||||||
|
# key: build-win64-meek-v0.37.0
|
||||||
|
# paths:
|
||||||
|
# - ~\project\desktop\onionshare\resources\tor\Tor\meek-client.exe
|
||||||
|
# - run:
|
||||||
|
# name: Build OnionShare
|
||||||
|
# command: |
|
||||||
|
# cd ~\project\desktop
|
||||||
|
# poetry run python .\setup-freeze.py build
|
||||||
|
# poetry run python .\scripts\build-windows.py cleanup-build
|
||||||
|
# - run:
|
||||||
|
# name: Compress
|
||||||
|
# command: |
|
||||||
|
# mv ~\project\desktop\build\exe.win-amd64-3.9\ ~\onionshare-win64
|
||||||
|
# Compress-Archive -LiteralPath ~\onionshare-win64 -DestinationPath ~\onionshare-win64.zip
|
||||||
|
# - store_artifacts:
|
||||||
|
# path: ~\onionshare-win64.zip
|
||||||
|
|
||||||
build-win32:
|
build-win32:
|
||||||
executor:
|
executor:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user