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

Fix macOS compress path. And make Windows builds again

Browse Source
This commit is contained in:
Micah Lee 2022-10-02 11:28:12 -07:00
parent eeae492966
commit 9d436ca281
1 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

336
.github/workflows/build.yml vendored
View File

@ -11,203 +11,203 @@ on:
- stable - stable
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: desktop\build\exe.win-amd64-3.9= path: desktop\build\exe.win-amd64-3.9=
# 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
@ -299,7 +299,7 @@ jobs:
- name: Compress - name: Compress
run: | run: |
cd ~/project/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