From 790fe8250cc15b8308733985c18ceb3ec8e5f8da Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Fri, 30 Sep 2022 16:01:03 -0700
Subject: [PATCH] Comment out desktop tests, and change the build windows
 workflow trigger

---
 .github/workflows/build-windows.yml |  7 ++---
 .github/workflows/tests.yml         | 44 +++++++++++++++--------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 3d4a393c..f16c28c9 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -1,10 +1,9 @@
 name: Build Windows
 run-name: Build win32 and win64 🚀
 on:
-  workflow_run:
-    workflows: "Run Tests"
-    types:
-      - completed
+  push:
+    branches:
+      - github-actions
 
 jobs:
   win64:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 97fed059..995db30b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,24 +28,26 @@ jobs:
           poetry run onionshare-cli --local-only --website ../docs --auto-stop-timer 2
           poetry run onionshare-cli --local-only --chat --auto-stop-timer 2
 
-  test-desktop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y tor obfs4proxy gcc python3-dev python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui
-          sudo apt-get install -y xvfb x11-utils libxkbcommon-x11-0 libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-render-util0 libxcb-icccm4 libxcb-keysyms1 libxcb-image0
-          pip install --upgrade pip poetry
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-desktop-poetry-${{ hashFiles('desktop/poetry.lock') }}
-      - run: cd desktop && poetry install
-      - run: |
-          cd desktop
-          QT_DEBUG_PLUGINS=1 xvfb-run poetry run pytest -v ./tests/test_gui_*.py
+  # skip desktop tests during dev, because they're so slow
+  
+  # test-desktop:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: actions/setup-python@v4
+  #       with:
+  #         python-version: '3.9'
+  #     - name: Install dependencies
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y tor obfs4proxy gcc python3-dev python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui
+  #         sudo apt-get install -y xvfb x11-utils libxkbcommon-x11-0 libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-render-util0 libxcb-icccm4 libxcb-keysyms1 libxcb-image0
+  #         pip install --upgrade pip poetry
+  #     - uses: actions/cache@v3
+  #       with:
+  #         path: ~/.cache/pypoetry/virtualenvs
+  #         key: ${{ runner.os }}-desktop-poetry-${{ hashFiles('desktop/poetry.lock') }}
+  #     - run: cd desktop && poetry install
+  #     - run: |
+  #         cd desktop
+  #         QT_DEBUG_PLUGINS=1 xvfb-run poetry run pytest -v ./tests/test_gui_*.py