From c22303ce0fde5d26e571241e3f402e172545fa8f Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Fri, 30 Sep 2022 16:34:06 -0700
Subject: [PATCH] Build obfs4proxy

---
 .github/workflows/build-windows.yml | 37 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 84be03cf..b987cefa 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -1,5 +1,5 @@
 name: Build Windows
-run-name: Build win32 and win64
+run-name: Build win32 and win64 🚀
 on:
   push:
     branches:
@@ -11,26 +11,39 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       
-      - uses: actions/cache@v3
+      - name: Restore cache - poetry
+        uses: actions/cache@v3
         with:
           path: ~\.cache\AppData\Local\pypoetry\Cache\virtualenvs
-          key: ${{ runner.os }}-win64-${{ hashFiles('desktop/poetry.lock') }}
+          key: ${{ runner.os }}-win64-poetry-${{ hashFiles('desktop/poetry.lock') }}
 
       - name: Install poetry
         run: C:\hostedtoolcache\windows\Python\3.9.13\x64\python -m pip install poetry
 
-      - name: Explore
-        shell: pwsh
-        run: |
-          which poetry
-
       - name: Install poetry dependencies
-        run: cd desktop && poetry install
+        run: cd desktop && C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts\poetry install
 
-      - uses: actions/cache@v3
+      - name: Restore cache - tor
+        uses: actions/cache@v3
         with:
           path: desktop\build\tor
-          key: ${{ runner.os }}-win64-${{ 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)
-        run: cd desktop && 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
+        uses: actions/cache@v3
+        with:
+          path: desktop\onionshare\resources\tor\obfs4proxy.exe
+          key: ${{ runner.os }}-win64-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.ps1') }}
+
+      - name: Build obfs4proxy
+        shell: pwsh
+        run: |
+          if ((Test-Path -Path 'project\desktop\onionshare\resources\tor\obfs4proxy.exe') -eq $True) {
+            Write-Output "obfs4proxy already built"
+          } else {
+            cd desktop
+            .\scripts\build-pt-obfs4proxy.ps1
+          }
\ No newline at end of file