Set ErrorActionPreference=Stop on Windows on exit

shivammathur · Mar 13, 2023 · 0fda8ed · 0fda8ed
1 parent 1b08836
commit 0fda8ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/scripts/tools/add_tools.ps1 b/src/scripts/tools/add_tools.ps1
@@ -17,6 +17,7 @@ Function Edit-ComposerConfig() {
   php -r "try {`$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception `$e) {exit(1);}"
   if ($? -eq $False) {
     Add-Log "$cross" "composer" "Could not download composer"
+    $ErrorActionPreference = "Stop"
     exit 1;
   }
   New-Item -ItemType Directory -Path $composer_bin -Force > $null 2>&1

diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1
@@ -23,6 +23,7 @@ Function Add-Log($mark, $subject, $message) {
   } else {
     printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
     if($env:fail_fast -eq 'true') {
+      $ErrorActionPreference = "Stop"
       exit 1;
     }
   }
@@ -337,6 +338,7 @@ if ( $env:GITHUB_ACTIONS -eq 'true') {
 if(-not($env:ImageOS) -and -not($env:ImageVersion)) {
   if($env:RUNNER -eq 'github') {
     Add-Log $cross "Runner" "Runner set as github in self-hosted environment"
+    $ErrorActionPreference = "Stop"
     exit 1
   }
   $bin_dir = 'C:\tools\bin'
@@ -348,6 +350,7 @@ if(-not($env:ImageOS) -and -not($env:ImageVersion)) {
   if($version -lt 5.6) {
     Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
     Start-Sleep 1
+    $ErrorActionPreference = "Stop"
     exit 1
   }
   if ($null -eq (Get-Module -ListAvailable -Name VcRedist)) {
@@ -418,6 +421,7 @@ if($env:DEBUG -eq 'true') {
 $installed = Get-Php -Path $php_dir
 if($installed.MajorMinorVersion -ne $version) {
   Add-Log $cross "PHP" "Could not setup PHP $version"
+  $ErrorActionPreference = "Stop"
   exit 1
 }
 if($version -lt "5.5") {