tmp

tobil4sk · Dec 7, 2024 · adcaf3d · adcaf3d
1 parent f471ae5
commit adcaf3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -92,13 +92,7 @@ jobs:
         shell: pwsh
         run: |
           Set-PSDebug -Trace 1
-          echo "-j=$env:NUMBER_OF_PROCESSORS"
-          echo "-j=$($env:NUMBER_OF_PROCESSORS)"
-          # can't figure out how to pass the number of cores here :/
-          echo exec -- make "-j=$env:NUMBER_OF_PROCESSORS"
-          echo "exec -- make -j=$env:NUMBER_OF_PROCESSORS"
-          (& opam env) -split '\r?\n' | ForEach-Object { Invoke-Expression $_ }
-          opam exec -- make -s -f Makefile.win -j "$env:NUMBER_OF_PROCESSORS" haxe
+          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
           ${{ env.CYG_ROOT }}/bin/cygcheck ./haxe.exe

diff --git a/extra/github-actions/build-windows.yml b/extra/github-actions/build-windows.yml
@@ -18,13 +18,7 @@
   shell: pwsh
   run: |
     Set-PSDebug -Trace 1
-    echo "-j=$env:NUMBER_OF_PROCESSORS"
-    echo "-j=$($env:NUMBER_OF_PROCESSORS)"
-    # can't figure out how to pass the number of cores here :/
-    echo exec -- make "-j=$env:NUMBER_OF_PROCESSORS"
-    echo "exec -- make -j=$env:NUMBER_OF_PROCESSORS"
-    (& opam env) -split '\r?\n' | ForEach-Object { Invoke-Expression $_ }
-    opam exec -- make -s -f Makefile.win -j "$env:NUMBER_OF_PROCESSORS" haxe
+    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
     ${{ env.CYG_ROOT }}/bin/cygcheck ./haxe.exe