From 7733e4cc550e3ca183e5bd5d8d64e7b5430bb11b Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Mon, 9 Dec 2024 09:48:18 +0000
Subject: [PATCH] tmp

---
 .github/workflows/main.yml             | 6 ++++--
 extra/github-actions/build-windows.yml | 6 ++++--
 haxe.opam                              | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 65bde6c1314..ad8bb182cfd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -96,6 +96,8 @@ jobs:
         shell: pwsh
         run: |
           Set-PSDebug -Trace 1
+          $PSNativeCommandUseErrorActionPreference = $true
+          $ErrorActionPreference = 'Stop'
           opam exec -- make -s -f Makefile.win -j"$env:NUMBER_OF_PROCESSORS" haxe
           opam exec -- make -s -f Makefile.win haxelib
           opam exec -- make -f Makefile.win echo_package_files package_bin package_installer_win package_choco
@@ -104,11 +106,11 @@ jobs:
           ls ./out
 
       - name: Check artifact
-        shell: bash
+        shell: pwsh
         run: |
           ls out
           # Output should contain binaries zip, installer zip and nupkg
-          [ $(ls -1 out | wc -l) -eq "3" ]
+          ( Get-ChildItem . | Measure-Object ).Count -eq 3
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
diff --git a/extra/github-actions/build-windows.yml b/extra/github-actions/build-windows.yml
index 7e9b90319a8..b9430791b63 100644
--- a/extra/github-actions/build-windows.yml
+++ b/extra/github-actions/build-windows.yml
@@ -18,6 +18,8 @@
   shell: pwsh
   run: |
     Set-PSDebug -Trace 1
+    $PSNativeCommandUseErrorActionPreference = $true
+    $ErrorActionPreference = 'Stop'
     opam exec -- make -s -f Makefile.win -j"$env:NUMBER_OF_PROCESSORS" haxe
     opam exec -- make -s -f Makefile.win haxelib
     opam exec -- make -f Makefile.win echo_package_files package_bin package_installer_win package_choco
@@ -26,11 +28,11 @@
     ls ./out
 
 - name: Check artifact
-  shell: bash
+  shell: pwsh
   run: |
     ls out
     # Output should contain binaries zip, installer zip and nupkg
-    [ $(ls -1 out | wc -l) -eq "3" ]
+    ( Get-ChildItem . | Measure-Object ).Count -eq 3
 
 - name: Upload artifact
   uses: actions/upload-artifact@v4
diff --git a/haxe.opam b/haxe.opam
index add12e884da..4a6d38fcb81 100644
--- a/haxe.opam
+++ b/haxe.opam
@@ -38,4 +38,4 @@ depends: [
 pin-depends: [
   ["camlp5.dev" "git+https://github.com/tobil4sk/camlp5#fix/cygwin-ocaml-check"]
   ["camlp5-buildscripts.dev" "git+https://github.com/tobil4sk/camlp5-buildscripts#feature/windows-support"]
-]
+] {os = "win32"}