Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-07-22 22:31:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upload snap directly without renaming, and uncomment the rest of the jobs in the build workflow

Browse source
This commit is contained in:
Micah Lee 2022-10-05 16:20:28 -07:00
parent 24e6514891
commit 0940c5c21c
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 280 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

561
.github/workflows/build.yml vendored
View file

@ -9,301 +9,301 @@ on:
- main - main
jobs: jobs:
# build-win64: build-win64:
# runs-on: windows-latest runs-on: windows-latest
# steps: steps:
# - uses: actions/checkout@v3 - uses: actions/checkout@v3
# - name: Install poetry - name: Install poetry
# run: C:\hostedtoolcache\windows\Python\3.9.13\x64\python -m pip install poetry run: C:\hostedtoolcache\windows\Python\3.9.13\x64\python -m pip install poetry
# - name: Restore cache - poetry - name: Restore cache - poetry
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: ~\AppData\Local\pypoetry\Cache\virtualenvs path: ~\AppData\Local\pypoetry\Cache\virtualenvs
# key: ${{ runner.os }}-win64-poetry-${{ hashFiles('desktop/poetry.lock') }} key: ${{ runner.os }}-win64-poetry-${{ hashFiles('desktop/poetry.lock') }}
# - name: Install poetry dependencies - name: Install poetry dependencies
# run: | run: |
# cd desktop cd desktop
# C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry install C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry install
# C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry env list --full-path C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry env list --full-path
# - name: Restore cache - tor - name: Restore cache - tor
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\build\tor path: desktop\build\tor
# key: ${{ runner.os }}-win64-tor-${{ hashFiles('desktop/scripts/get-tor.py') }} key: ${{ runner.os }}-win64-tor-${{ hashFiles('desktop/scripts/get-tor.py') }}
# - name: Get tor binaries from Tor Browser (64-bit) - name: Get tor binaries from Tor Browser (64-bit)
# run: cd desktop && C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry run python .\scripts\get-tor.py win64 run: cd desktop && C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry run python .\scripts\get-tor.py win64
# - name: Restore cache - obfs4proxy - name: Restore cache - obfs4proxy
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\onionshare\resources\tor\obfs4proxy.exe path: desktop\onionshare\resources\tor\obfs4proxy.exe
# key: ${{ runner.os }}-win64-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.ps1') }} key: ${{ runner.os }}-win64-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.ps1') }}
# - name: Build obfs4proxy - name: Build obfs4proxy
# shell: pwsh shell: pwsh
# run: | run: |
# if ((Test-Path -Path 'desktop\onionshare\resources\tor\obfs4proxy.exe') -eq $True) { if ((Test-Path -Path 'desktop\onionshare\resources\tor\obfs4proxy.exe') -eq $True) {
# Write-Output "obfs4proxy already built" Write-Output "obfs4proxy already built"
# } else { } else {
# cd desktop cd desktop
# .\scripts\build-pt-obfs4proxy.ps1 .\scripts\build-pt-obfs4proxy.ps1
# } }
# - name: Restore cache - snowflake - name: Restore cache - snowflake
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\onionshare\resources\tor\snowflake-client.exe path: desktop\onionshare\resources\tor\snowflake-client.exe
# key: ${{ runner.os }}-win64-snowflake-${{ hashFiles('desktop/scripts/build-pt-snowflake.ps1') }} key: ${{ runner.os }}-win64-snowflake-${{ hashFiles('desktop/scripts/build-pt-snowflake.ps1') }}
# - name: Build snowflake - name: Build snowflake
# shell: pwsh shell: pwsh
# run: | run: |
# if ((Test-Path -Path 'desktop\onionshare\resources\tor\snowflake-client.exe') -eq $True) { if ((Test-Path -Path 'desktop\onionshare\resources\tor\snowflake-client.exe') -eq $True) {
# Write-Output "snowflake already built" Write-Output "snowflake already built"
# } else { } else {
# cd desktop cd desktop
# .\scripts\build-pt-snowflake.ps1 .\scripts\build-pt-snowflake.ps1
# } }
# - name: Restore cache - meek - name: Restore cache - meek
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\onionshare\resources\tor\meek-client.exe path: desktop\onionshare\resources\tor\meek-client.exe
# key: ${{ runner.os }}-win64-meek-${{ hashFiles('desktop/scripts/build-pt-meek.ps1') }} key: ${{ runner.os }}-win64-meek-${{ hashFiles('desktop/scripts/build-pt-meek.ps1') }}
# - name: Build meek - name: Build meek
# shell: pwsh shell: pwsh
# run: | run: |
# if ((Test-Path -Path 'desktop\onionshare\resources\tor\meek-client.exe') -eq $True) { if ((Test-Path -Path 'desktop\onionshare\resources\tor\meek-client.exe') -eq $True) {
# Write-Output "meek already built" Write-Output "meek already built"
# } else { } else {
# cd desktop cd desktop
# .\scripts\build-pt-meek.ps1 .\scripts\build-pt-meek.ps1
# } }
# - name: Build OnionShare - name: Build OnionShare
# run: | run: |
# 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 - name: Compress
# shell: pwsh shell: pwsh
# run: | run: |
# mv desktop\build\exe.win-amd64-3.9\ ~\onionshare-win64 mv desktop\build\exe.win-amd64-3.9\ ~\onionshare-win64
# Compress-Archive -LiteralPath ~\onionshare-win64 -DestinationPath ~\onionshare-win64.zip 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: ~\onionshare-win64.zip
# build-win32: build-win32:
# runs-on: windows-latest runs-on: windows-latest
# steps: steps:
# - uses: actions/checkout@v3 - uses: actions/checkout@v3
# - name: Install poetry - name: Install poetry
# run: C:\hostedtoolcache\windows\Python\3.9.13\x86\python -m pip install poetry run: C:\hostedtoolcache\windows\Python\3.9.13\x86\python -m pip install poetry
# - name: Restore cache - poetry - name: Restore cache - poetry
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: ~\AppData\Local\pypoetry\Cache\virtualenvs path: ~\AppData\Local\pypoetry\Cache\virtualenvs
# key: ${{ runner.os }}-win32-poetry-${{ hashFiles('desktop/poetry.lock') }} key: ${{ runner.os }}-win32-poetry-${{ hashFiles('desktop/poetry.lock') }}
# - name: Install poetry dependencies - name: Install poetry dependencies
# run: | run: |
# cd desktop cd desktop
# C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry install C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry install
# C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry env list --full-path C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry env list --full-path
# - name: Restore cache - tor - name: Restore cache - tor
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\build\tor path: desktop\build\tor
# key: ${{ runner.os }}-win32-tor-${{ hashFiles('desktop/scripts/get-tor.py') }} key: ${{ runner.os }}-win32-tor-${{ hashFiles('desktop/scripts/get-tor.py') }}
# - name: Get tor binaries from Tor Browser (32-bit) - name: Get tor binaries from Tor Browser (32-bit)
# run: cd desktop && C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry run python .\scripts\get-tor.py win32 run: cd desktop && C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry run python .\scripts\get-tor.py win32
# - name: Install golang (32-bit) - name: Install golang (32-bit)
# shell: pwsh shell: pwsh
# run: | run: |
# cd ~\Downloads cd ~\Downloads
# Invoke-WebRequest -Uri https://go.dev/dl/go1.19.1.windows-386.msi -OutFile go1.19.1.windows-386.msi Invoke-WebRequest -Uri https://go.dev/dl/go1.19.1.windows-386.msi -OutFile go1.19.1.windows-386.msi
# msiexec.exe /i go1.19.1.windows-386.msi /quiet /L*V go-install.log msiexec.exe /i go1.19.1.windows-386.msi /quiet /L*V go-install.log
# - name: Restore cache - obfs4proxy - name: Restore cache - obfs4proxy
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\onionshare\resources\tor\obfs4proxy.exe path: desktop\onionshare\resources\tor\obfs4proxy.exe
# key: ${{ runner.os }}-win32-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.ps1') }} key: ${{ runner.os }}-win32-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.ps1') }}
# - name: Build obfs4proxy - name: Build obfs4proxy
# shell: pwsh shell: pwsh
# run: | run: |
# if ((Test-Path -Path 'desktop\onionshare\resources\tor\obfs4proxy.exe') -eq $True) { if ((Test-Path -Path 'desktop\onionshare\resources\tor\obfs4proxy.exe') -eq $True) {
# Write-Output "obfs4proxy already built" Write-Output "obfs4proxy already built"
# } else { } else {
# $env:PATH = "C:\Program Files (x86)\Go\bin\go;$env:PATH" $env:PATH = "C:\Program Files (x86)\Go\bin\go;$env:PATH"
# cd desktop cd desktop
# .\scripts\build-pt-obfs4proxy.ps1 .\scripts\build-pt-obfs4proxy.ps1
# } }
# - name: Restore cache - snowflake - name: Restore cache - snowflake
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\onionshare\resources\tor\snowflake-client.exe path: desktop\onionshare\resources\tor\snowflake-client.exe
# key: ${{ runner.os }}-win32-snowflake-${{ hashFiles('desktop/scripts/build-pt-snowflake.ps1') }} key: ${{ runner.os }}-win32-snowflake-${{ hashFiles('desktop/scripts/build-pt-snowflake.ps1') }}
# - name: Build snowflake - name: Build snowflake
# shell: pwsh shell: pwsh
# run: | run: |
# if ((Test-Path -Path 'desktop\onionshare\resources\tor\snowflake-client.exe') -eq $True) { if ((Test-Path -Path 'desktop\onionshare\resources\tor\snowflake-client.exe') -eq $True) {
# Write-Output "snowflake already built" Write-Output "snowflake already built"
# } else { } else {
# $env:PATH = "C:\Program Files (x86)\Go\bin\go;$env:PATH" $env:PATH = "C:\Program Files (x86)\Go\bin\go;$env:PATH"
# cd desktop cd desktop
# .\scripts\build-pt-snowflake.ps1 .\scripts\build-pt-snowflake.ps1
# } }
# - name: Restore cache - meek - name: Restore cache - meek
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop\onionshare\resources\tor\meek-client.exe path: desktop\onionshare\resources\tor\meek-client.exe
# key: ${{ runner.os }}-win32-meek-${{ hashFiles('desktop/scripts/build-pt-meek.ps1') }} key: ${{ runner.os }}-win32-meek-${{ hashFiles('desktop/scripts/build-pt-meek.ps1') }}
# - name: Build meek - name: Build meek
# shell: pwsh shell: pwsh
# run: | run: |
# if ((Test-Path -Path 'desktop\onionshare\resources\tor\meek-client.exe') -eq $True) { if ((Test-Path -Path 'desktop\onionshare\resources\tor\meek-client.exe') -eq $True) {
# Write-Output "meek already built" Write-Output "meek already built"
# } else { } else {
# $env:PATH = "C:\Program Files (x86)\Go\bin\go;$env:PATH" $env:PATH = "C:\Program Files (x86)\Go\bin\go;$env:PATH"
# cd desktop cd desktop
# .\scripts\build-pt-meek.ps1 .\scripts\build-pt-meek.ps1
# } }
# - name: Build OnionShare - name: Build OnionShare
# run: | run: |
# 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 - name: Compress
# shell: pwsh shell: pwsh
# run: | run: |
# mv desktop\build\exe.win32-3.9\ ~\onionshare-win32 mv desktop\build\exe.win32-3.9\ ~\onionshare-win32
# Compress-Archive -LiteralPath ~\onionshare-win32 -DestinationPath ~\onionshare-win32.zip 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: ~\onionshare-win32.zip
# build-mac: build-mac:
# runs-on: macos-latest runs-on: macos-latest
# steps: steps:
# - uses: actions/checkout@v3 - uses: actions/checkout@v3
# - name: Install Python 3.9.13 (Intel) - name: Install Python 3.9.13 (Intel)
# run: | run: |
# curl -L https://www.python.org/ftp/python/3.9.13/python-3.9.13-macosx10.9.pkg --output ~/Downloads/python.pkg curl -L https://www.python.org/ftp/python/3.9.13/python-3.9.13-macosx10.9.pkg --output ~/Downloads/python.pkg
# sudo installer -pkg ~/Downloads/python.pkg -target / sudo installer -pkg ~/Downloads/python.pkg -target /
# - name: Install poetry - name: Install poetry
# run: | run: |
# python3 -m pip install poetry python3 -m pip install poetry
# - name: Restore cache - poetry - name: Restore cache - poetry
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: ~/Library/Caches/pypoetry/virtualenvs path: ~/Library/Caches/pypoetry/virtualenvs
# key: ${{ runner.os }}-macos-poetry-${{ hashFiles('desktop/poetry.lock') }} key: ${{ runner.os }}-macos-poetry-${{ hashFiles('desktop/poetry.lock') }}
# - name: Install poetry dependencies - name: Install poetry dependencies
# run: | run: |
# cd desktop cd desktop
# /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry install /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry install
# - name: Restore cache - tor - name: Restore cache - tor
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop/build/tor path: desktop/build/tor
# key: ${{ runner.os }}-macos-tor-${{ hashFiles('desktop/scripts/get-tor.py') }} key: ${{ runner.os }}-macos-tor-${{ hashFiles('desktop/scripts/get-tor.py') }}
# - name: Get tor binaries from Tor Browser - name: Get tor binaries from Tor Browser
# run: | run: |
# cd desktop cd desktop
# /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./scripts/get-tor.py macos /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./scripts/get-tor.py macos
# - name: Restore cache - obfs4proxy - name: Restore cache - obfs4proxy
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop/onionshare/resources/tor/obfs4proxy path: desktop/onionshare/resources/tor/obfs4proxy
# key: ${{ runner.os }}-macos-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.sh') }} key: ${{ runner.os }}-macos-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.sh') }}
# - name: Build obfs4proxy - name: Build obfs4proxy
# run: | run: |
# if [[ -f "desktop/onionshare/resources/tor/obfs4proxy" ]]; then if [[ -f "desktop/onionshare/resources/tor/obfs4proxy" ]]; then
# echo "obfs4proxy already built" echo "obfs4proxy already built"
# else else
# cd desktop cd desktop
# ./scripts/build-pt-obfs4proxy.sh ./scripts/build-pt-obfs4proxy.sh
# fi fi
# - name: Restore cache - snowflake - name: Restore cache - snowflake
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop/onionshare/resources/tor/snowflake-client path: desktop/onionshare/resources/tor/snowflake-client
# key: ${{ runner.os }}-macos-snowflake-${{ hashFiles('desktop/scripts/build-pt-snowflake.sh') }} key: ${{ runner.os }}-macos-snowflake-${{ hashFiles('desktop/scripts/build-pt-snowflake.sh') }}
# - name: Build snowflake - name: Build snowflake
# run: | run: |
# if [[ -f "desktop/onionshare/resources/tor/snowflake-client" ]]; then if [[ -f "desktop/onionshare/resources/tor/snowflake-client" ]]; then
# echo "snowflake already built" echo "snowflake already built"
# else else
# cd desktop cd desktop
# ./scripts/build-pt-snowflake.sh ./scripts/build-pt-snowflake.sh
# fi fi
# - name: Restore cache - meek - name: Restore cache - meek
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: desktop/onionshare/resources/tor/meek-client path: desktop/onionshare/resources/tor/meek-client
# key: ${{ runner.os }}-macos-meek-${{ hashFiles('desktop/scripts/build-pt-meek.sh') }} key: ${{ runner.os }}-macos-meek-${{ hashFiles('desktop/scripts/build-pt-meek.sh') }}
# - name: Build meek - name: Build meek
# run: | run: |
# if [[ -f "desktop/onionshare/resources/tor/meek-client" ]]; then if [[ -f "desktop/onionshare/resources/tor/meek-client" ]]; then
# echo "meek already built" echo "meek already built"
# else else
# cd desktop cd desktop
# ./scripts/build-pt-meek.sh ./scripts/build-pt-meek.sh
# fi fi
# - name: Build OnionShare - name: Build OnionShare
# run: | run: |
# cd desktop cd desktop
# /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./setup-freeze.py build /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./setup-freeze.py build
# /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./setup-freeze.py bdist_mac /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./setup-freeze.py bdist_mac
# /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./scripts/build-macos.py cleanup-build /Library/Frameworks/Python.framework/Versions/3.9/bin/poetry run python ./scripts/build-macos.py cleanup-build
# - name: Compress - name: Compress
# run: | run: |
# cd desktop/build cd desktop/build
# tar -czvf ~/onionshare-macos.tar.gz OnionShare.app 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-macos.tar.gz
build-snap: build-snap:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -322,46 +322,43 @@ jobs:
key: snapcraft-cache key: snapcraft-cache
- name: Build snap - name: Build snap
run: | run: sudo snapcraft --use-lxd
sudo snapcraft --use-lxd
VERSION=$(cat cli/onionshare_cli/resources/version.txt)
mv onionshare_${VERSION}_amd64.snap ~/onionshare_amd64.snap
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: flatpak-build name: flatpak-build
path: ~/onionshare_amd64.snap path: onionshare_*.snap
# build-flatpak: build-flatpak:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - uses: actions/checkout@v3 - uses: actions/checkout@v3
# - name: Setup - name: Setup
# run: | run: |
# sudo apt update sudo apt update
# sudo apt install -y flatpak flatpak-builder sudo apt install -y flatpak flatpak-builder
# flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
# - name: Restore cache - .flatpak-builder - name: Restore cache - .flatpak-builder
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: flatpak/.flatpak-builder path: flatpak/.flatpak-builder
# key: flatpak-.flatpak-builder key: flatpak-.flatpak-builder
# - name: Restore cache - build - name: Restore cache - build
# uses: actions/cache@v3 uses: actions/cache@v3
# with: with:
# path: flatpak/build path: flatpak/build
# key: flatpak-build key: flatpak-build
# - name: Flatpak build - name: Flatpak build
# run: | run: |
# cd flatpak cd flatpak
# flatpak-builder build --force-clean --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml flatpak-builder build --force-clean --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml
# flatpak build-bundle ~/.local/share/flatpak/repo ~/OnionShare.flatpak org.onionshare.OnionShare --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo flatpak build-bundle ~/.local/share/flatpak/repo ~/OnionShare.flatpak org.onionshare.OnionShare --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
# - uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
# with: with:
# name: flatpak-build name: flatpak-build
# path: ~/OnionShare.flatpak path: ~/OnionShare.flatpak