aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-09-30 16:25:07 -0700
committerMicah Lee <micah@micahflee.com>2022-09-30 16:25:07 -0700
commit7c44deda0950aa09c6a5ed97b7af83da9923d625 (patch)
treec3d9abdde0edd17ef3d7e725888a87b1eba5c18b /.github
parent790fe8250cc15b8308733985c18ceb3ec8e5f8da (diff)
downloadonionshare-7c44deda0950aa09c6a5ed97b7af83da9923d625.tar.gz
onionshare-7c44deda0950aa09c6a5ed97b7af83da9923d625.zip
Try using Python 3.9 that comes with github actions runner
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-windows.yml41
-rw-r--r--.github/workflows/tests.yml2
2 files changed, 14 insertions, 29 deletions
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index f16c28c9..84be03cf 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -1,51 +1,36 @@
name: Build Windows
-run-name: Build win32 and win64 🚀
+run-name: Build win32 and win64
on:
push:
branches:
- github-actions
jobs:
- win64:
+ build-win64:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- - name: Install Python 3.9.14 (64-bit)
- shell: pwsh
- run: |
- cd ~\Downloads
- Invoke-WebRequest -Uri https://www.python.org/ftp/python/3.9.14/python-3.9.14-amd64.exe -OutFile python-3.9.14-amd64.exe
- .\python-3.9.14-amd64.exe /quiet InstallAllUsers=1 TargetDir=C:\Python39
- while($true) {
- if ((Test-Path -Path C:\Python39\python.exe) -eq $True) {
- Write-Output "Python is installed"
- break
- } else {
- Write-Output "Waiting for Python to finish installing ..."
- Start-Sleep -Seconds 2
- }
- }
-
- uses: actions/cache@v3
with:
path: ~\.cache\AppData\Local\pypoetry\Cache\virtualenvs
key: ${{ runner.os }}-win64-${{ hashFiles('desktop/poetry.lock') }}
- - run:
- name: Install poetry
- run: C:\Python39\python -m pip install poetry
+ - name: Install poetry
+ run: C:\hostedtoolcache\windows\Python\3.9.13\x64\python -m pip install poetry
+
+ - name: Explore
+ shell: pwsh
+ run: |
+ which poetry
- - run:
- name: Install poetry dependencies
- run: cd desktop && C:\Python39\scripts\poetry install
+ - name: Install poetry dependencies
+ run: cd desktop && poetry install
- uses: actions/cache@v3
with:
path: desktop\build\tor
key: ${{ runner.os }}-win64-${{ hashFiles('desktop/scripts/get-tor.py') }}
- - run:
- name: Get tor binaries from Tor Browser (64-bit)
- run: cd desktop && C:\Python39\Scripts\poetry run python .\scripts\get-tor.py win64
- \ No newline at end of file
+ - name: Get tor binaries from Tor Browser (64-bit)
+ run: cd desktop && poetry run python .\scripts\get-tor.py win64
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 995db30b..daffb0bf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,5 +1,5 @@
name: Run Tests
-run-name: Run tests 🚀
+run-name: Run tests
on: [push]
jobs: