update pipeline

Author: roffe

.github/workflows/windows-release.yml

@@ -24,6 +24,11 @@ jobs:
     - uses: actions/checkout@v5
       with:
         submodules: recursive
+
+    - name: Install NSIS
+      uses: repolevedavaj/[email protected]
+      with:
+        nsis-version: '3.10'
 
     - name: Set up Go
       uses: actions/setup-go@v6
@@ -48,12 +53,16 @@ jobs:
       run: |
         $env:PATH += ";D:\a\txlogger\txlogger\llvm-mingw\bin"
         $env:PATH
-        .\build.ps1 -cangateway -txlogger
+        .\build.ps1 -cangateway -txlogger -setup
 
     - name: Creating Zip
       if: startsWith(github.ref, 'refs/tags/')
       run: 7z a txlogger.zip txlogger.exe cangateway.exe .\debug.bat C:\Progra~2\Kvaser\Canlib\Bin\canlib32.dll .\vcpkg\packages\libusb_x64-windows\bin\libusb-1.0.dll .\canusb\dll64\canusbdrv64.dll
 
+    - name: Creating Setup Zip
+      if: startsWith(github.ref, 'refs/tags/')
+      run: 7z a txlogger-setup.zip txlogger_setup.exe
+
     - name: Release
       uses: softprops/action-gh-release@v2
       if: github.ref_type == 'tag'

build.ps1

@@ -86,19 +86,6 @@ if ($txlogger) {
 
 if ($setup) {
     Write-Host "Building txlogger_setup.exe"
-
     $ifpPath = (Get-Location).Path + "\setup\setup.nsi"
     Start-Process -FilePath "C:\Program Files (x86)\NSIS\makensis.exe" -ArgumentList $ifpPath -WorkingDirectory (Get-Location).Path -NoNewWindow -Wait
-
-    if (-not (Test-Path "txlogger_setup.exe")) {
-        Write-Host "txlogger_setup.exe not found. Exiting."
-        exit
-    }
-
-    $filesToAdd = "txlogger_setup.exe"
-    $outputZip = "dist\setup.zip"
-    $winRarArgs = "a -m5 -afzip $outputZip $filesToAdd"
-
-    Write-Output "Creating setup.zip"
-    Start-Process -FilePath $winRarExe -ArgumentList $winRarArgs -NoNewWindow -Wait
 }

release.ps1

@@ -47,6 +47,20 @@ Write-Output "Creating $outputZip"
 $winRarArgs = "a -ep -m5 -afzip $outputZip $($files -join ' ')"
 Start-Process -FilePath $winrarExe -ArgumentList $winRarArgs -NoNewWindow -Wait
 
+
+if (-not (Test-Path "txlogger_setup.exe")) {
+    Write-Host "txlogger_setup.exe not found. Exiting."
+    exit
+}
+if (-not ($beta)) {
+    $filesToAdd = "txlogger_setup.exe"
+    $outputZip = "dist\setup.zip"
+    $winRarArgs = "a -m5 -afzip $outputZip $filesToAdd"
+
+    Write-Output "Creating setup.zip"
+    Start-Process -FilePath $winRarExe -ArgumentList $winRarArgs -NoNewWindow -Wait
+}
+
 if ($beta) {
     scp dist\txlogger_beta.zip roffe@192.168.2.177:/var/www/html/txlogger
 }