Try to run oq without Start-Job and fix Write-Host format

gem · Jul 28, 2023 · 89791aa · 89791aa
1 parent f625faa
commit 89791aa
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/windows_full_test.yml b/.github/workflows/windows_full_test.yml
@@ -61,7 +61,7 @@ jobs:
           python -m pip install pip --upgrade
           #echo Branch to test %BRANCH%
           #if %BRANCH%=="" (python install.py devel) else (python install.py devel --version %BRANCH%)
-          write-Host "Branch to test $Env:BRANCH "
+          write-Host "Branch to test $($Env:BRANCH)"
           if ($Env:BRANCH)
           {
             Write-Host "Install with workflow_dispatch"
@@ -84,18 +84,18 @@ jobs:
           Write-Host "Run all demos having only job.ini"
           $iniFilePaths = Get-ChildItem D:\a\oq-engine\oq-engine\demos -Recurse -Filter job.ini
           foreach($iniFilePath in $iniFilePaths) {
-            Write-Host "Run $iniFilePath.FullName"
-            Start-Job -ScriptBlock{& 'C:\Users\runneradmin\openquake\Scripts\oq.exe' engine --run $iniFilePath.FullName --exports xml,hdf5 -p pointsource_distance=0 -r }
+            Write-Host "Run $($iniFilePath.FullName)"
+            oq engine --run $iniFilePath.FullName --exports xml,hdf5 -p pointsource_distance=0 -r
           }
           Write-Host "Run all demos having only job_hazard.ini and job_risk.ini"
           $demoDirs = Get-ChildItem D:\a\oq-engine\oq-engine\demos -Recurse -Directory
           foreach($demoDir in $demoDirs) {
             $jobHazardPaths = Get-ChildItem $demoDir -Filter job_hazard.ini
             foreach($jobHazardPath in $jobHazardPaths) {
-              Write-Host "Run $jobHazardPath.FullName"
-              Start-Job -ScriptBlock{& 'C:\Users\runneradmin\openquake\Scripts\oq.exe' engine --run $jobHazardPath.FullName --exports npz -p pointsource_distance=0 }
-              Write-Host "Run $demoDir.FullName\job_risk.ini"
-              Start-Job -ScriptBlock{& 'C:\Users\runneradmin\openquake\Scripts\oq.exe' engine --run $demoDir.FullName\job_risk.ini --hc -1 }
+              Write-Host "Run $($jobHazardPath.FullName)"
+              oq engine --run $jobHazardPath.FullName --exports npz -p pointsource_distance=0
+              Write-Host "Run $($demoDir.FullName)\job_risk.ini"
+              oq engine --run $demoDir.FullName\job_risk.ini --hc -1
             }
           }
       - name: Run all engine tests