From d73ccc6284d3191af65f5e784ee18501c3a12089 Mon Sep 17 00:00:00 2001
From: Adam Plowman <adam.jp@live.co.uk>
Date: Tue, 29 Sep 2026 16:47:45 +0100
Subject: [PATCH 1/6] fix: missing `$` in env var

---
 .github/workflows/build-exes-impl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-exes-impl.yml b/.github/workflows/build-exes-impl.yml
index 9400395..a9b3a70 100644
--- a/.github/workflows/build-exes-impl.yml
+++ b/.github/workflows/build-exes-impl.yml
@@ -280,7 +280,7 @@ jobs:
         id: win_onefile
         if: inputs.build_onefile == 'true'
         working-directory: ${{ inputs.pyinstaller_dir }}
-        run: ./make.ps1 -ExeName "$env:EXE_NAME" -LogLevel "env:LOG_LEVEL" -BuildType 'onefile'
+        run: ./make.ps1 -ExeName "$env:EXE_NAME" -LogLevel "$env:LOG_LEVEL" -BuildType 'onefile'
         env:
           EXE_NAME: ${{ inputs.executable_name }}-${{ needs.status.outputs.version }}-win
           LOG_LEVEL: ${{ inputs.logLevel }}

From b28206adc3013ddbc25d0676455a5769a345699a Mon Sep 17 00:00:00 2001
From: Adam Plowman <adam.jp@live.co.uk>
Date: Tue, 29 Sep 2026 21:02:58 +0100
Subject: [PATCH 2/6] fix: missing `$` in env var

---
 .github/workflows/build-exes-impl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-exes-impl.yml b/.github/workflows/build-exes-impl.yml
index a9b3a70..83c6eb8 100644
--- a/.github/workflows/build-exes-impl.yml
+++ b/.github/workflows/build-exes-impl.yml
@@ -335,7 +335,7 @@ jobs:
         run: |
           poetry run $env:EXE_NAME data install-cache "$($env:EXE_NAME)-app-data-cache/data"
           poetry run $env:EXE_NAME data --list
-          poetry run $env:EXE_NAME program install-cache "$(env:EXE_NAME)-app-data-cache/programs"
+          poetry run $env:EXE_NAME program install-cache "$($env:EXE_NAME)-app-data-cache/programs"
           poetry run $env:EXE_NAME program --list
 
       - name: Run test suite on the frozen app (file)

From 9eee391a5fdbdd0b1c8d554f4e1332402a950611 Mon Sep 17 00:00:00 2001
From: Adam Plowman <adam.jp@live.co.uk>
Date: Tue, 29 Sep 2026 21:07:20 +0100
Subject: [PATCH 3/6] fix: try to fix docker build

---
 .github/workflows/build-exes-impl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-exes-impl.yml b/.github/workflows/build-exes-impl.yml
index 83c6eb8..d919d26 100644
--- a/.github/workflows/build-exes-impl.yml
+++ b/.github/workflows/build-exes-impl.yml
@@ -567,7 +567,7 @@ jobs:
         with:
           options: |
             -v ${{ github.workspace }}:/home
-            -u $THE_USER
+            -u ${{ steps.user.outputs.user }}
             --env HOME=/home
             --env XDG_DATA_HOME=/home/.local/share
             --env XDG_CACHE_HOME=/home/.cache

From 22e1db160361e4302044d3078b51e0c094ce7ab2 Mon Sep 17 00:00:00 2001
From: Adam Plowman <adam.jp@live.co.uk>
Date: Tue, 29 Sep 2026 21:12:05 +0100
Subject: [PATCH 4/6] fix: add missing env var to docker

---
 .github/workflows/build-exes-impl.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-exes-impl.yml b/.github/workflows/build-exes-impl.yml
index d919d26..9a0e5a0 100644
--- a/.github/workflows/build-exes-impl.yml
+++ b/.github/workflows/build-exes-impl.yml
@@ -636,6 +636,7 @@ jobs:
           options: |
             -v ${{ github.workspace }}:/home
             --env GH_TOKEN
+            --env UNIT_TESTS
             --env EXE_NAME
             --env LOG_LEVEL
             --env PYINST_DIR
@@ -674,6 +675,7 @@ jobs:
         env:
           PYINST_DIR: ${{ inputs.pyinstaller_dir }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          UNIT_TESTS: ${{ inputs.unit_tests }}
           EXE_NAME: ${{ inputs.executable_name }}
           LOG_LEVEL: ${{ inputs.logLevel }}
           VER: ${{ needs.status.outputs.version }}

From 169e5b5aaefa5fbe012b41c6a5da54d560441484 Mon Sep 17 00:00:00 2001
From: Adam Plowman <adam.jp@live.co.uk>
Date: Tue, 29 Sep 2026 21:19:07 +0100
Subject: [PATCH 5/6] fix: call operator in windows pyinstaller test runs

---
 .github/workflows/build-exes-impl.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-exes-impl.yml b/.github/workflows/build-exes-impl.yml
index 9a0e5a0..dfded55 100644
--- a/.github/workflows/build-exes-impl.yml
+++ b/.github/workflows/build-exes-impl.yml
@@ -347,8 +347,8 @@ jobs:
           EXE_FILE: ${{ inputs.pyinstaller_dir }}/dist/onefile/${{ inputs.executable_name }}-${{ needs.status.outputs.version }}-win.exe
           ENV_SRC: ${{ steps.configure_python_env.outputs.env_source_file }}
           ARGS: ${{ inputs.unit_test_args }}
-        run: |
-          "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS
+        run: |        
+          & "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS
 
       - name: Run test suite on the frozen app (folder)
         if: steps.win_onedir.outcome == 'success' && inputs.unit_tests == 'true'
@@ -360,7 +360,7 @@ jobs:
           ENV_SRC: ${{ steps.configure_python_env.outputs.env_source_file }}
           ARGS: ${{ inputs.unit_test_args }}
         run: |
-          "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS
+          & "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS
 
       - name: Run integration test suite on the frozen app (file) # tests are more likely to fail in the one-file build than the one-dir build, so just run integration tests with the one-file build
         if: steps.win_onefile.outcome == 'success' && inputs.integration_tests == 'true'
@@ -372,7 +372,7 @@ jobs:
           ENV_SRC: ${{ steps.configure_python_env.outputs.env_source_file }}
           ARGS: ${{ inputs.integration_test_args }}
         run: |
-          "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS --integration
+          & "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS --integration
 
   macos:
     name: Build macOS Executables

From d55a2909ea31f55c96115b5948c39417c39d7524 Mon Sep 17 00:00:00 2001
From: Adam Plowman <adam.jp@live.co.uk>
Date: Tue, 29 Sep 2026 21:23:34 +0100
Subject: [PATCH 6/6] fix: variable mixup

---
 .github/workflows/build-exes-impl.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-exes-impl.yml b/.github/workflows/build-exes-impl.yml
index dfded55..ba9be89 100644
--- a/.github/workflows/build-exes-impl.yml
+++ b/.github/workflows/build-exes-impl.yml
@@ -600,10 +600,10 @@ jobs:
             cd ..
 
             # install cache data
-            poetry run "$PYINST_DIR" data install-cache "${EXE_NAME}-app-data-cache/data"
-            poetry run "$PYINST_DIR" data --list
-            poetry run "$PYINST_DIR" program install-cache "${EXE_NAME}-app-data-cache/programs"
-            poetry run "$PYINST_DIR" program --list
+            poetry run "$EXE_NAME" data install-cache "${EXE_NAME}-app-data-cache/data"
+            poetry run "$EXE_NAME" data --list
+            poetry run "$EXE_NAME" program install-cache "${EXE_NAME}-app-data-cache/programs"
+            poetry run "$EXE_NAME" program --list
 
             export PYTHONUNBUFFERED=ok
             if [ "$UNIT_TESTS" = "true" ]; then