Merge pull request #60 from supervoidcoder/command-and-git-peb

Author: supervoidcoder

.github/workflows/build.yml

@@ -5,6 +5,7 @@ permissions:
 jobs:
   build-and-test:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - arch: x64
@@ -65,14 +66,16 @@ jobs:
           # Verify the exe is accessible
           Write-Host "Checking win-witr.exe availability..."
           win-witr --version
+          if ($LASTEXITCODE -ne 0) {
+              Write-Error "it's broken 💥"
+              exit 1
+            }
           
           # Run all test .bat files
+          $env:force_ansi = 1
           Get-ChildItem -Path tests -Recurse -Filter *.bat | ForEach-Object {
             Write-Host "Running test: $($_.FullName)"
             & $_.FullName
-            if ($LASTEXITCODE -ne 0) {
-              Write-Error "Test failed: $($_.Name)"
-              exit 1
-            }
+            
           }
         

.github/workflows/release.yml

@@ -310,33 +310,32 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Compile for ${{ matrix.arch }}
-        shell: cmd
+        shell: pwsh
         run: |
-          @echo off
-          REM Find vcvarsall.bat dynamically
-          for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
-            set "VS_PATH=%%i"
-          )
-          
-          if not exist "%VS_PATH%\VC\Auxiliary\Build\vcvarsall.bat" (
-            echo Error: vcvarsall.bat not found.
-            exit /b 1
-          )
-
-          REM Map architecture for cross-compilation (host_target)
-          REM GitHub Actions windows-latest runners are x64, so we need x64_<target> for cross-compilation
-          set "TARGET_ARCH=${{ matrix.arch }}"
-          set "VCVARS_ARCH=%TARGET_ARCH%"
-          if "%TARGET_ARCH%"=="x86" set "VCVARS_ARCH=x64_x86"
-          if "%TARGET_ARCH%"=="arm64" set "VCVARS_ARCH=x64_arm64"
-
-          REM Initialize environment for the target architecture
-          call "%VS_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH%
-
-          set outName=win-witr-${{ matrix.arch }}.exe
-          echo Compiling %outName%...
-          cl /O2 /Ot /GL /std:c++20 /EHsc main.cpp /DUNICODE /D_UNICODE /Fe:%outName%
-          if errorlevel 1 exit /b 1
+          # Set version as environment variable
+          $env:VERSION_NUMBER = "${{ needs.prepare.outputs.version }}"
+          
+          # Find and initialize MSVC
+          $vsPath = & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
+            -latest -products * `
+            -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
+            -property installationPath
+          
+          $vcvarsPath = Join-Path $vsPath "VC\Auxiliary\Build\vcvarsall.bat"
+          
+          $targetArch = "${{ matrix.arch }}"
+          $vcvarsArch = $targetArch
+          if ($targetArch -eq "x86") { $vcvarsArch = "x64_x86" }
+          if ($targetArch -eq "arm64") { $vcvarsArch = "x64_arm64" }
+          
+          # Use cmd to call vcvarsall and then cl
+          $outName = "win-witr-${{ matrix.arch }}.exe"
+          $ver = "${{ needs.prepare.outputs.version_number }}"
+          cmd /c "`"$vcvarsPath`" $vcvarsArch && cl /O2 /Ot /GL /std:c++20 /EHsc main.cpp /DUNICODE /D_UNICODE /DVERSION_NUMBER=\"$ver\" /Fe:$outName"
+          if ($LASTEXITCODE -ne 0) {
+              Write-Host "Build failed with exit code $LASTEXITCODE"
+              Exit $LASTEXITCODE
+          }
 
       - name: Upload build artifact for ${{ matrix.arch }}
         uses: actions/upload-artifact@v4