From 646c200bf021fdfdcf4423ee5e4f8e6f9226be6d Mon Sep 17 00:00:00 2001 From: cj-vana Date: Mon, 22 Sep 2025 08:48:20 -0600 Subject: [PATCH 1/6] Update build-installers.yml --- .github/workflows/build-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index aada368..8445377 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -295,7 +295,7 @@ jobs: - name: Build NSIS installer run: | cd agents/capture-agent-py - makensis installer.nsi + & "C:\Program Files (x86)\NSIS\makensis.exe" installer.nsi - name: Upload Windows installer uses: actions/upload-artifact@v4 From 6a5c8ce49122bb6697da746b915c803f8179aa47 Mon Sep 17 00:00:00 2001 From: cj-vana Date: Mon, 22 Sep 2025 08:50:17 -0600 Subject: [PATCH 2/6] Update build-installers.yml --- .github/workflows/build-installers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 8445377..034a05a 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -293,6 +293,7 @@ jobs: shell: bash - name: Build NSIS installer + shell: pwsh run: | cd agents/capture-agent-py & "C:\Program Files (x86)\NSIS\makensis.exe" installer.nsi From 02fa4bd6c9bcb65313cff29fc58491edd22e7d64 Mon Sep 17 00:00:00 2001 From: cj-vana Date: Mon, 22 Sep 2025 08:51:45 -0600 Subject: [PATCH 3/6] Update build-installers.yml --- .github/workflows/build-installers.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 034a05a..30ed9fe 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -224,7 +224,10 @@ jobs: pyinstaller --onefile --name sounddocs-capture-agent --add-data "capture_agent:capture_agent" --add-data "generate_cert.py:." main.py - name: Install NSIS - run: choco install nsis -y + run: | + choco install nsis -y + echo "C:\Program Files (x86)\NSIS" >> $env:GITHUB_PATH + shell: pwsh - name: Create NSIS installer script run: | @@ -293,10 +296,9 @@ jobs: shell: bash - name: Build NSIS installer - shell: pwsh run: | cd agents/capture-agent-py - & "C:\Program Files (x86)\NSIS\makensis.exe" installer.nsi + makensis installer.nsi - name: Upload Windows installer uses: actions/upload-artifact@v4 From ba6f76163a485bccdd5129d110d141801bc48f0d Mon Sep 17 00:00:00 2001 From: cj-vana Date: Mon, 22 Sep 2025 08:53:52 -0600 Subject: [PATCH 4/6] Update build-installers.yml --- .github/workflows/build-installers.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 30ed9fe..5849d39 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -226,7 +226,9 @@ jobs: - name: Install NSIS run: | choco install nsis -y - echo "C:\Program Files (x86)\NSIS" >> $env:GITHUB_PATH + $nsisRoot = "${env:ProgramFiles(x86)}\NSIS\Bin" + if (-not (Test-Path $nsisRoot)) { throw "NSIS Bin folder not found at $nsisRoot" } + Add-Content -Path $env:GITHUB_PATH -Value $nsisRoot shell: pwsh - name: Create NSIS installer script From 2e71cc2fe52b68747d0052d47379bac58c40241f Mon Sep 17 00:00:00 2001 From: cj-vana Date: Mon, 22 Sep 2025 08:56:24 -0600 Subject: [PATCH 5/6] Update build-installers.yml --- .github/workflows/build-installers.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 5849d39..8982779 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -224,12 +224,13 @@ jobs: pyinstaller --onefile --name sounddocs-capture-agent --add-data "capture_agent:capture_agent" --add-data "generate_cert.py:." main.py - name: Install NSIS + shell: pwsh run: | choco install nsis -y - $nsisRoot = "${env:ProgramFiles(x86)}\NSIS\Bin" - if (-not (Test-Path $nsisRoot)) { throw "NSIS Bin folder not found at $nsisRoot" } + $nsisRoot = Join-Path -Path ${env:ProgramFiles(x86)} -ChildPath 'NSIS\Bin' + if (-not (Test-Path -LiteralPath $nsisRoot)) { throw "NSIS Bin folder not found at $nsisRoot" } + if (-not (Test-Path -LiteralPath (Join-Path $nsisRoot "makensis.exe"))) { throw "makensis.exe not found in $nsisRoot" } Add-Content -Path $env:GITHUB_PATH -Value $nsisRoot - shell: pwsh - name: Create NSIS installer script run: | From f3a8e0d0eb48a6de9add9d7ce02e4557c27ad656 Mon Sep 17 00:00:00 2001 From: cj-vana Date: Mon, 22 Sep 2025 09:04:22 -0600 Subject: [PATCH 6/6] Update build-installers.yml --- .github/workflows/build-installers.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 8982779..10dcb6a 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -227,9 +227,13 @@ jobs: shell: pwsh run: | choco install nsis -y - $nsisRoot = Join-Path -Path ${env:ProgramFiles(x86)} -ChildPath 'NSIS\Bin' + if ($LASTEXITCODE -ne 0) { throw "Chocolatey failed to install NSIS. Exit code: $LASTEXITCODE" } + $pf86 = ${env:ProgramFiles(x86)} + $nsisRoot = Join-Path -Path $pf86 -ChildPath 'NSIS\Bin' if (-not (Test-Path -LiteralPath $nsisRoot)) { throw "NSIS Bin folder not found at $nsisRoot" } - if (-not (Test-Path -LiteralPath (Join-Path $nsisRoot "makensis.exe"))) { throw "makensis.exe not found in $nsisRoot" } + $makensis = Join-Path $nsisRoot 'makensis.exe' + if (-not (Test-Path -LiteralPath $makensis)) { throw "makensis.exe not found in path: $nsisRoot" } + & $makensis /VERSION | Out-Host Add-Content -Path $env:GITHUB_PATH -Value $nsisRoot - name: Create NSIS installer script