Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-03 15:05:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Switch Windows (32-bit and 64-bit) to Python 3.11.1

Browse source
This commit is contained in:
Micah Lee 2023-02-05 13:31:34 -08:00
parent 9de8777376
commit bbc11a01de
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,11 +14,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Observing the VM...
run: dir C:\hostedtoolcache\windows\Python\
- 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.11.1\x64\python -m pip install poetry
- name: Restore cache - poetry - name: Restore cache - poetry
uses: actions/cache@v3 uses: actions/cache@v3
@ -29,8 +26,8 @@ jobs:
- 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.11.1\x64\Scripts\poetry install
C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry env list --full-path C:\hostedtoolcache\windows\Python\3.11.1\x64\Scripts\poetry env list --full-path
- name: Restore cache - tor - name: Restore cache - tor
uses: actions/cache@v3 uses: actions/cache@v3
@ -39,7 +36,7 @@ jobs:
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.11.1\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
@ -92,13 +89,13 @@ jobs:
- 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.11.1\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.11.1\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.11\ ~\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
@ -112,7 +109,7 @@ jobs:
- 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.11.1\x86\python -m pip install poetry
- name: Restore cache - poetry - name: Restore cache - poetry
uses: actions/cache@v3 uses: actions/cache@v3
@ -123,8 +120,8 @@ jobs:
- 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.11.1\x86\Scripts\poetry install
C:\hostedtoolcache\windows\Python\3.9.13\x86\Scripts\poetry env list --full-path C:\hostedtoolcache\windows\Python\3.11.1\x86\Scripts\poetry env list --full-path
- name: Restore cache - tor - name: Restore cache - tor
uses: actions/cache@v3 uses: actions/cache@v3
@ -133,7 +130,7 @@ jobs:
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.11.1\x86\Scripts\poetry run python .\scripts\get-tor.py win32
- name: Install golang (32-bit) - name: Install golang (32-bit)
shell: pwsh shell: pwsh
@ -196,13 +193,13 @@ jobs:
- 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.11.1\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.11.1\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.11\ ~\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

2
desktop/scripts/build-windows.py
View file

@ -22,7 +22,7 @@ def get_build_path():
python_arch = "win-amd64" python_arch = "win-amd64"
else: else:
python_arch = "win32" python_arch = "win32"
return os.path.join(desktop_dir, "build", f"exe.{python_arch}-3.9") return os.path.join(desktop_dir, "build", f"exe.{python_arch}-3.11")
def get_size(dir): def get_size(dir):