Merge PR #824.

.github/workflows/windows.yml

@@ -22,10 +22,16 @@ jobs:
 
       - name: Install dependencies
         run: |
-          choco install swig
           python -m pip install --upgrade pip
           pip install poetry
 
+      - name: Build the Helper
+        run: |
+          # Needed to shorten the path for zxing-cpp build
+          $env:TMPDIR = "C:\e"
+          poetry config virtualenvs.path C:\e
+          .\build-helper.bat
+
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
@@ -38,9 +44,6 @@ jobs:
           flutter test
           flutter analyze
 
-      - name: Build the Helper
-        run: .\build-helper.bat
-
       - name: Build the app
         run: |
           $version = python set-version.py | select-object -first 1

build-helper.bat

@@ -2,18 +2,23 @@
 
 echo Building authenticator-helper for Windows...
 cd helper
-poetry install
+poetry install || goto :error
 rmdir /s /q ..\build\windows\helper
-poetry run pyinstaller authenticator-helper.spec --distpath ..\build\windows
+poetry run pyinstaller authenticator-helper.spec --distpath ..\build\windows || goto :error
 
 echo Generating license files...
 rmdir /s /q ..\build\windows\helper-license-venv
-poetry build
-poetry run python -m venv ..\build\windows\helper-license-venv
-..\build\windows\helper-license-venv\Scripts\python -m pip install --upgrade pip wheel
-..\build\windows\helper-license-venv\Scripts\python -m pip install dist\authenticator_helper-0.1.0-py3-none-any.whl pip-licenses
-..\build\windows\helper-license-venv\Scripts\pip-licenses --format=json --no-license-path --with-license-file --ignore-packages authenticator-helper zxing-cpp --output-file ..\assets\licenses\helper.json
+poetry build || goto :error
+poetry run python -m venv ..\build\windows\helper-license-venv || goto :error
+..\build\windows\helper-license-venv\Scripts\python -m pip install --upgrade pip wheel || goto :error
+..\build\windows\helper-license-venv\Scripts\python -m pip install dist\authenticator_helper-0.1.0-py3-none-any.whl pip-licenses || goto :error
+..\build\windows\helper-license-venv\Scripts\pip-licenses --format=json --no-license-path --with-license-file --ignore-packages authenticator-helper zxing-cpp --output-file ..\assets\licenses\helper.json || goto :error
 
 cd ..
 
 echo All done, output in build/windows/
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%